From: Romain Francoise <romain@orebokech.com>
Date: Sun, 14 Aug 2005 08:49:58 +0000 (+0000)
Subject: Remove conflict marker, move entry to its chronological location.
X-Git-Url: https://cgit.sxemacs.org/?a=commitdiff_plain;h=f68264bf3f7a184a8e5a815db21ed6f29a3e2e80;p=gnus

Remove conflict marker, move entry to its chronological location.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f033ec713..768f84c3a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,9 +1,3 @@
-2005-07-14  Lars Magne Ingebrigtsen  <larsi@gnus.org>
-
-	* gnus-msg.el (gnus-button-mailto): Remove
-	save-selected-window-window hackery because it relies on
-	save-selected-window internals.
-
 2005-08-13  Romain Francoise  <romain@orebokech.com>
 
 	* message.el (message-cite-original-1): New function.
@@ -189,7 +183,12 @@
 	gnus-score-edit-exit-function to gnus-score-edit-done and call
 	gnus-message.
 
->>>>>>> 7.737
+2005-07-14  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+	* gnus-msg.el (gnus-button-mailto): Remove
+	save-selected-window-window hackery because it relies on
+	save-selected-window internals.
+
 2005-07-13  Katsumi Yamaoka  <yamaoka@jpl.org>
 
 	* gnus-salt.el (gnus-pick-mode): Remove the 5th arg of