Index: auctex/ChangeLog
diff -u auctex/ChangeLog:5.1042 auctex/ChangeLog:5.1043
--- auctex/ChangeLog:5.1042     Fri May  6 09:09:34 2005
+++ auctex/ChangeLog    Fri May  6 11:51:01 2005
@@ -18,7 +18,6 @@
        * tex-fold.el (TeX-fold-mode): Improve doc string and add its
        first line to the autoload form.
 
->>>>>>> 5.1041
 2005-05-04  David Kastrup  <[EMAIL PROTECTED]>
 
        * tex-fold.el (TeX-fold-mode): Change autoload cookie because of


_______________________________________________
auctex-diffs mailing list
[EMAIL PROTECTED]
http://lists.gnu.org/mailman/listinfo/auctex-diffs

Reply via email to