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