diff options
Diffstat (limited to 'database/xbase/CONFLICTS')
| -rwxr-xr-x | database/xbase/CONFLICTS | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/database/xbase/CONFLICTS b/database/xbase/CONFLICTS deleted file mode 100755 index 1fce0067e3..0000000000 --- a/database/xbase/CONFLICTS +++ /dev/null @@ -1 +0,0 @@ -conflicts xbase y |