summaryrefslogtreecommitdiffstats
path: root/qt5
diff options
context:
space:
mode:
authorTreeve Jelbert2020-11-07 09:16:30 +0100
committerTreeve Jelbert2020-11-07 09:20:56 +0100
commit6a081d7fa7e895e40efee9f67a3c10150dbf138b (patch)
treee1105f028741fe9229c3aaf35550d1be06613791 /qt5
parent968e168ce3592f2845c5a019f0f49023895314c1 (diff)
libassuan: => 2.5.4
Diffstat (limited to 'qt5')
-rwxr-xr-xqt5/qtwebengine/CONFLICTS1
1 files changed, 1 insertions, 0 deletions
diff --git a/qt5/qtwebengine/CONFLICTS b/qt5/qtwebengine/CONFLICTS
new file mode 100755
index 0000000000..4f6c7be727
--- /dev/null
+++ b/qt5/qtwebengine/CONFLICTS
@@ -0,0 +1 @@
+conflicts minizip y