summaryrefslogtreecommitdiff
path: root/tests/commit_fixtures/osctest/conflict/.osc/_package
diff options
context:
space:
mode:
Diffstat (limited to 'tests/commit_fixtures/osctest/conflict/.osc/_package')
-rw-r--r--tests/commit_fixtures/osctest/conflict/.osc/_package1
1 files changed, 0 insertions, 1 deletions
diff --git a/tests/commit_fixtures/osctest/conflict/.osc/_package b/tests/commit_fixtures/osctest/conflict/.osc/_package
deleted file mode 100644
index 783a0ef..0000000
--- a/tests/commit_fixtures/osctest/conflict/.osc/_package
+++ /dev/null
@@ -1 +0,0 @@
-conflict \ No newline at end of file