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