From d87a2963d1fe93510e92aa3fdf64a7a412ec60e2 Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Mon, 2 May 2005 06:22:58 +0000 Subject: [PATCH] Remove >>> conflict markers. --- src/ChangeLog | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 33134d8aaf..0f9838871e 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -392,7 +392,6 @@ Mon Mar 14 21:05:13 2005 Ben Pfaff * flip.c: (cmd_flip) Ditto. ->>>>>>> 1.161 Sun Mar 13 22:52:05 2005 Ben Pfaff * file-handle.q: (struct file_handle) `open_mode' should not be @@ -443,7 +442,6 @@ Sun Mar 13 22:35:55 2005 Ben Pfaff (initialize_aggregate_info) Fix initialization for MIN, MAX for strings. ->>>>>>> 1.160 Sat Mar 12 23:26:21 2005 Ben Pfaff Start work on testing and debugging AGGREGATE. -- 2.30.2