summaryrefslogtreecommitdiffstats
path: root/e-17/eet/CONFLICTS
diff options
context:
space:
mode:
Diffstat (limited to 'e-17/eet/CONFLICTS')
-rwxr-xr-xe-17/eet/CONFLICTS1
1 files changed, 1 insertions, 0 deletions
diff --git a/e-17/eet/CONFLICTS b/e-17/eet/CONFLICTS
new file mode 100755
index 0000000000..a33a547293
--- /dev/null
+++ b/e-17/eet/CONFLICTS
@@ -0,0 +1 @@
+conflicts efl