# HG changeset patch
# User Glenn Morris <rgm@gnu.org>
# Date 1233814959 0
# Node ID 76eba80f381627b6666654da76ad5a0a09c129ac
# Parent  73703b41e43aa30bdb17dc61574f032f014a68e0
Fix previous change.

diff -r 73703b41e43a -r 76eba80f3816 etc/ChangeLog
--- a/etc/ChangeLog	Thu Feb 05 06:21:19 2009 +0000
+++ b/etc/ChangeLog	Thu Feb 05 06:22:39 2009 +0000
@@ -1,17 +1,3 @@
-<<<<<<< ChangeLog
-2009-02-02  Carsten Dominik  <dominik@science.uva.nl>
-
-	* refcards/orgcard.tex: New version number.
-
-2009-01-31  Carsten Dominik  <dominik@science.uva.nl>
-
-	* refcards/orgcard.tex: New version number.
-
-2009-01-30  Carsten Dominik  <dominik@science.uva.nl>
-
-	* refcards/orgcard.tex: New version number.
-
-=======
 2009-02-04  Dan Nicolaescu  <dann@ics.uci.edu>
 
 	* compilation.txt (gnu): Add an example for the "note" format.
@@ -20,7 +6,10 @@
 
 	* PROBLEMS (CPP): Note problem with resource compiler of MSVC.
 
->>>>>>> 1.761
+2009-02-02  Carsten Dominik  <dominik@science.uva.nl>
+
+	* refcards/orgcard.tex: New version number.
+
 2009-01-28  Juanma Barranquero  <lekktu@gmail.com>
 
 	* PROBLEMS (Windows): Add entry about TCC/4NT and App Paths keys.