From: Glenn Morris <rgm@gnu.org>
Date: Thu, 5 Feb 2009 06:22:39 +0000 (+0000)
Subject: Fix previous change.
X-Git-Tag: emacs-pretest-23.0.91~407
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2c015ae7872cd9ec9ea041d8725bd6815ba7b5a7;p=emacs.git

Fix previous change.
---

diff --git a/etc/ChangeLog b/etc/ChangeLog
index 4f9935c9150..89526065a08 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -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.