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