From: Ben Pfaff <blp@gnu.org>
Date: Mon, 2 May 2005 06:22:58 +0000 (+0000)
Subject: Remove >>> conflict markers.
X-Git-Tag: v0.4.0~103
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d87a2963d1fe93510e92aa3fdf64a7a412ec60e2;p=pspp-builds.git

Remove >>> conflict markers.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 33134d8a..0f983887 100644
--- 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.