# HG changeset patch
# User Michael Albinus <michael.albinus@gmx.de>
# Date 1254148068 0
# Node ID 5707f7454ab5cd9798b5268147ea919945add6e1
# Parent  0e947a4050e9cdb7690c4f1f34ac9411e85b8394
*** empty log message ***

diff -r 0e947a4050e9 -r 5707f7454ab5 doc/misc/ChangeLog
--- a/doc/misc/ChangeLog	Mon Sep 28 14:27:08 2009 +0000
+++ b/doc/misc/ChangeLog	Mon Sep 28 14:27:48 2009 +0000
@@ -1,4 +1,3 @@
-<<<<<<< ChangeLog
 2009-09-28  Michael Albinus  <michael.albinus@gmx.de>
 
 	* tramp.texi (History): Add IMAP support.
@@ -9,12 +8,10 @@
 
 	* trampver.texi: Set default value of `emacsimap'.
 
-=======
 2009-09-22  Daiki Ueno  <ueno@unixuser.org>
 
 	* gnus.texi (Security): Document mm-sign-option and mm-encrypt-option.
 
->>>>>>> 1.320
 2009-09-13  Chong Yidong  <cyd@stupidchicken.com>
 
 	* dired-x.texi (Technical Details): Delete