summaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authorVlad Glagolev2019-05-25 15:32:44 +0000
committerVlad Glagolev2019-05-25 15:32:44 +0000
commitc625484d31e08178cff784f3862158179ca4339d (patch)
tree8b2c8ca0f759ce87624e84883552f2bc61cc91a6 /ChangeLog
parent350b54dcd58a6a839993f622476f357a242711bc (diff)
Correct ChangeLog after 2ee93b9
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog1
1 files changed, 0 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 1a87b2ecb8..1816caea6c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -277,7 +277,6 @@
* kernels/e1000e: spell deleted (now in linux kernel)
* kernels/e1000: spell deleted (now in linux kernel)
* kernels/e100: spell deleted (now in linux kernel)
->>>>>>> obsolete
2019-01-05 Treeve Jelbert <treeve@sourcemage.org>
* qt5-qmake/qupzilla: spell deprecated [replaced by falkon]