summaryrefslogtreecommitdiff
path: root/tests/data/SPECS/conflicttest.spec
diff options
context:
space:
mode:
Diffstat (limited to 'tests/data/SPECS/conflicttest.spec')
-rwxr-xr-x[-rw-r--r--]tests/data/SPECS/conflicttest.spec0
1 files changed, 0 insertions, 0 deletions
diff --git a/tests/data/SPECS/conflicttest.spec b/tests/data/SPECS/conflicttest.spec
index 894b632..894b632 100644..100755
--- a/tests/data/SPECS/conflicttest.spec
+++ b/tests/data/SPECS/conflicttest.spec