summaryrefslogtreecommitdiffstats
path: root/qt5
diff options
context:
space:
mode:
authorTreeve Jelbert2020-11-02 10:43:40 +0100
committerTreeve Jelbert2020-11-02 10:43:40 +0100
commit351eb3ea1b1181a7d0ce63a3d67de701f03eff96 (patch)
treee88f5aac58cdbbe6e5a87ca54bf7df7d2f84ea76 /qt5
parent55ba62ec3300455296e00aa406acda6c0ddd7bfc (diff)
qtspeech - delete CONFLICTS
Diffstat (limited to 'qt5')
-rwxr-xr-xqt5/qtspeech/CONFLICTS1
-rw-r--r--qt5/qtspeech/HISTORY3
2 files changed, 3 insertions, 1 deletions
diff --git a/qt5/qtspeech/CONFLICTS b/qt5/qtspeech/CONFLICTS
deleted file mode 100755
index e5e407004b..0000000000
--- a/qt5/qtspeech/CONFLICTS
+++ /dev/null
@@ -1 +0,0 @@
-conflicts qtspeech y
diff --git a/qt5/qtspeech/HISTORY b/qt5/qtspeech/HISTORY
index 8ebdfdacd5..ccbf6d95d8 100644
--- a/qt5/qtspeech/HISTORY
+++ b/qt5/qtspeech/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