From: Romain Francoise <romain@orebokech.com>
Date: Sun, 12 Oct 2008 09:17:13 +0000 (+0000)
Subject: Delete leftover conflict markers.
X-Git-Tag: emacs-pretest-23.0.90~2533
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=69d31e51835237e7de0881d202cd2a66b446f45a;p=emacs.git

Delete leftover conflict markers.
---

diff --git a/etc/ChangeLog b/etc/ChangeLog
index f849a96a66e..6ea7ddebbfd 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -45,13 +45,11 @@
 	* PROBLEMS:
 	* MACHINES: Remove VMS info.
 
->>>>>>> 1.736
 2008-07-27  Dan Nicolaescu  <dann@ics.uci.edu>
 
 	* PROBLEMS:
 	* MACHINES: Remove mentions of Mac Carbon.
 
->>>>>>> 1.727
 2008-07-24  Vinicius Jose Latorre  <viniciusjl@ig.com.br>
 
 	* NEWS: New function `diff-show-trailing-blanks' in diff-mode.el.