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
commitcbe9bb75724a4d24e189de2e01f43a44d3d201c0 (patch)
tree4ad6b04ce96cff4c8f4b9c127221be5ee93bd070 /qt5
parent351eb3ea1b1181a7d0ce63a3d67de701f03eff96 (diff)
qtsvg - delete CONFLICTS
Diffstat (limited to 'qt5')
-rwxr-xr-xqt5/qtsvg/CONFLICTS1
-rw-r--r--qt5/qtsvg/HISTORY3
2 files changed, 3 insertions, 1 deletions
diff --git a/qt5/qtsvg/CONFLICTS b/qt5/qtsvg/CONFLICTS
deleted file mode 100755
index 35d6705e7d..0000000000
--- a/qt5/qtsvg/CONFLICTS
+++ /dev/null
@@ -1 +0,0 @@
-conflicts qtsvg y
diff --git a/qt5/qtsvg/HISTORY b/qt5/qtsvg/HISTORY
index 2d40cd6882..ad2e7a2d3a 100644
--- a/qt5/qtsvg/HISTORY
+++ b/qt5/qtsvg/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