diff options
Diffstat (limited to 'e-17/edje/CONFLICTS')
| -rwxr-xr-x | e-17/edje/CONFLICTS | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/e-17/edje/CONFLICTS b/e-17/edje/CONFLICTS new file mode 100755 index 0000000000..cb61eb5db7 --- /dev/null +++ b/e-17/edje/CONFLICTS @@ -0,0 +1,4 @@ +if [[ "x${EDJE_BRANCH}" != "xscm" ]] +then + conflicts efl +fi |