# HG changeset patch
# User Romain Francoise <romain@orebokech.com>
# Date 1223803033 0
# Node ID 28e7a63d136919277e0070af860a9961a474b777
# Parent  7581dc5f5f9606d80629259abe5cef8323662f04
Delete leftover conflict markers.

diff -r 7581dc5f5f96 -r 28e7a63d1369 etc/ChangeLog
--- a/etc/ChangeLog	Sun Oct 12 06:22:56 2008 +0000
+++ b/etc/ChangeLog	Sun Oct 12 09:17:13 2008 +0000
@@ -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.