summaryrefslogtreecommitdiffstats
path: root/qt5
diff options
context:
space:
mode:
authorTreeve Jelbert2020-11-02 10:43:41 +0100
committerTreeve Jelbert2020-11-02 10:43:41 +0100
commitc50533de7212c40c0cb11070555179061a9e55a4 (patch)
tree01ee2ad16e35416355b9e436eb914e51357cf4b5 /qt5
parentbdcff6812ed2c749d235c5ddbbba3d52d02c5a02 (diff)
qtwayland - delete CONFLICTS
Diffstat (limited to 'qt5')
-rwxr-xr-xqt5/qtwayland/CONFLICTS1
-rw-r--r--qt5/qtwayland/HISTORY3
2 files changed, 3 insertions, 1 deletions
diff --git a/qt5/qtwayland/CONFLICTS b/qt5/qtwayland/CONFLICTS
deleted file mode 100755
index 05c8e86d9e..0000000000
--- a/qt5/qtwayland/CONFLICTS
+++ /dev/null
@@ -1 +0,0 @@
-conflicts qtwayland y
diff --git a/qt5/qtwayland/HISTORY b/qt5/qtwayland/HISTORY
index bfe62a1cea..dcb35ee904 100644
--- a/qt5/qtwayland/HISTORY
+++ b/qt5/qtwayland/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