Remove >>> conflict markers.

diff --git a/src/ChangeLog b/src/ChangeLog
index 33134d8aaf12c1f93571f4331af04daa85db285e..0f9838871e77e166277be0a4838b2521f60fae45 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -392,7 +392,6 @@ Mon Mar 14 21:05:13 2005  Ben Pfaff  <blp@gnu.org>
 
        * flip.c: (cmd_flip) Ditto.
 
->>>>>>> 1.161
 Sun Mar 13 22:52:05 2005  Ben Pfaff  <blp@gnu.org>
 
        * file-handle.q: (struct file_handle) `open_mode' should not be
@@ -443,7 +442,6 @@ Sun Mar 13 22:35:55 2005  Ben Pfaff  <blp@gnu.org>
        (initialize_aggregate_info) Fix initialization for MIN, MAX for
        strings.
 
->>>>>>> 1.160
 Sat Mar 12 23:26:21 2005  Ben Pfaff  <blp@gnu.org>
 
        Start work on testing and debugging AGGREGATE.