[Pspp-cvs] Changes to pspp/src/ChangeLog

[Ben Pfaff]

Index: pspp/src/ChangeLog
diff -u pspp/src/ChangeLog:1.175 pspp/src/ChangeLog:1.176
--- pspp/src/ChangeLog:1.175    Mon May  2 06:21:20 2005
+++ pspp/src/ChangeLog  Mon May  2 06:22:58 2005
@@ -392,7 +392,6 @@
 
        * flip.c: (cmd_flip) Ditto.
 
->>>>>>> 1.161
 Sun Mar 13 22:52:05 2005  Ben Pfaff  <address@hidden>
 
        * file-handle.q: (struct file_handle) `open_mode' should not be
@@ -443,7 +442,6 @@
        (initialize_aggregate_info) Fix initialization for MIN, MAX for
        strings.
 
->>>>>>> 1.160
 Sat Mar 12 23:26:21 2005  Ben Pfaff  <address@hidden>
 
        Start work on testing and debugging AGGREGATE.