Fix up recent merge ChangeLog duplication

Perhaps the merge was done without using bzrmerge.el

2 files changed, 5 insertions, 24 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 306570323df..c7015c7a7d5 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -26,18 +26,6 @@
         (Bug#3647) --- unfortunately, only for freshly-compiled code.
         Please make bootstrap.
 
-2014-03-23  Richard Stallman  <rms@gnu.org>
-
-        * battery.el (battery-linux-sysfs): Search for each field
-        from the beginning of the buffer.
-
-2014-03-23  Daniel Colascione  <dancol@dancol.org>
-
-        * emacs-lisp/cl-macs.el (cl--do-arglist): Use a little `cl-loop'
-        list to look for keyword arguments instead of `memq', fixing
-        (Bug#3647) --- unfortunately, only for freshly-compiled code.
-        Please make bootstrap.
-
 2014-03-22  Glenn Morris  <rgm@gnu.org>
 
         * dired.el (dired-read-regexp): Make obsolete.
diff --git a/test/ChangeLog b/test/ChangeLog
index 026357771bf..392a996662a 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,17 +1,15 @@
-2014-03-23  Daniel Colascione  <dancol@dancol.org>
+2014-03-23  Dmitry Gutov  <dgutov@yandex.ru>
 
-        * automated/subword-tests.el (subword-tests2): More subword tests.
+        * automated/package-test.el (package-test-describe-package):
+        Fix test failure in non-graphical mode.
 
 2014-03-23  Daniel Colascione  <dancol@dancol.org>
 
+        * automated/subword-tests.el (subword-tests2): More subword tests.
+
         * automated/cl-lib.el (cl-lib-keyword-names-versus-values): New
         test: correct parsing of keyword arguments.
 
-2014-03-23  Dmitry Gutov  <dgutov@yandex.ru>
-
-        * automated/package-test.el (package-test-describe-package):
-        Fix test failure in non-graphical mode.
-
 2014-03-22  Dmitry Gutov  <dgutov@yandex.ru>
 
         * automated/package-test.el (package-test-describe-package):
@@ -30,11 +28,6 @@
         * automated/data/package/archive-contents:
         Add info about the new package.
 
-2014-03-23  Daniel Colascione  <dancol@dancol.org>
-
-        * automated/cl-lib.el (cl-lib-keyword-names-versus-values): New
-        test: correct parsing of keyword arguments.
-
 2014-03-07  Michael Albinus  <michael.albinus@gmx.de>
 
         * automated/tramp-tests.el (tramp-copy-size-limit): Declare.