summaryrefslogtreecommitdiffstats
path: root/qt5/qtmultimedia/CONFLICTS
diff options
context:
space:
mode:
Diffstat (limited to 'qt5/qtmultimedia/CONFLICTS')
-rwxr-xr-xqt5/qtmultimedia/CONFLICTS1
1 files changed, 1 insertions, 0 deletions
diff --git a/qt5/qtmultimedia/CONFLICTS b/qt5/qtmultimedia/CONFLICTS
new file mode 100755
index 0000000000..78849727d7
--- /dev/null
+++ b/qt5/qtmultimedia/CONFLICTS
@@ -0,0 +1 @@
+conflicts qtmultimedia y