summaryrefslogtreecommitdiffstats
path: root/qt5
diff options
context:
space:
mode:
authorTreeve Jelbert2020-11-02 10:43:42 +0100
committerTreeve Jelbert2020-11-02 10:43:42 +0100
commitd48df12c93f04c73eb81b8ed4cb1c023f5b5b68c (patch)
tree4cdbb1c6abde869dd7bb40b96f886cfc79f420bb /qt5
parentc0e339c924fb193c8dc172709dac401124e6f226 (diff)
qtwebglplugin - delete CONFLICTS
Diffstat (limited to 'qt5')
-rwxr-xr-xqt5/qtwebglplugin/CONFLICTS1
-rw-r--r--qt5/qtwebglplugin/HISTORY3
2 files changed, 3 insertions, 1 deletions
diff --git a/qt5/qtwebglplugin/CONFLICTS b/qt5/qtwebglplugin/CONFLICTS
deleted file mode 100755
index 15bc1e770d..0000000000
--- a/qt5/qtwebglplugin/CONFLICTS
+++ /dev/null
@@ -1 +0,0 @@
-conflicts qtwebglplugin y
diff --git a/qt5/qtwebglplugin/HISTORY b/qt5/qtwebglplugin/HISTORY
index 83bf958707..8958d4eca6 100644
--- a/qt5/qtwebglplugin/HISTORY
+++ b/qt5/qtwebglplugin/HISTORY
@@ -1,3 +1,6 @@
+2020-11-02 Treeve Jelbert <treeve@sourcemage.org>
+ * CONLICTS: deleted
+
2020-09-09 Treeve Jelbert <treeve@sourcemage.org>
* DETAILS: version 5.15.1