summaryrefslogtreecommitdiffstats
path: root/database/xbsql/CONFLICTS
diff options
context:
space:
mode:
Diffstat (limited to 'database/xbsql/CONFLICTS')
-rwxr-xr-xdatabase/xbsql/CONFLICTS1
1 files changed, 0 insertions, 1 deletions
diff --git a/database/xbsql/CONFLICTS b/database/xbsql/CONFLICTS
deleted file mode 100755
index 0f8836ef18..0000000000
--- a/database/xbsql/CONFLICTS
+++ /dev/null
@@ -1 +0,0 @@
-conflicts xbsql y