summaryrefslogtreecommitdiffstats
path: root/devel/qgit/CONFLICTS
diff options
context:
space:
mode:
Diffstat (limited to 'devel/qgit/CONFLICTS')
-rwxr-xr-xdevel/qgit/CONFLICTS2
1 files changed, 0 insertions, 2 deletions
diff --git a/devel/qgit/CONFLICTS b/devel/qgit/CONFLICTS
deleted file mode 100755
index bea33cce03..0000000000
--- a/devel/qgit/CONFLICTS
+++ /dev/null
@@ -1,2 +0,0 @@
-conflicts qgit4
-