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, 1 insertions, 0 deletions
diff --git a/database/rekall/CONFLICTS b/database/rekall/CONFLICTS
new file mode 100755
index 0000000000..b4c5ab8b01
--- /dev/null
+++ b/database/rekall/CONFLICTS
@@ -0,0 +1 @@
+conflicts rekall y