procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove CVS conflict markers.

Browse source
This commit is contained in:
Reiner Steib 2005-05-20 17:47:03 +00:00
parent 44a91a68ec
commit 57d8ef63ee
1 changed files with 0 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
man/ChangeLog
View file

@ -2,12 +2,10 @@
* org.texi: Version 3.09
<<<<<<< ChangeLog
2005-05-18 Carsten Dominik <dominik@science.uva.nl>
* reftex.texi: Version 4.28
=======
2005-05-18 Luc Teirlinck <teirllm@auburn.edu>
* buffers.texi (Select Buffer): Document `C-u M-g M-g'.
@ -124,7 +122,6 @@
* building.texi (Debugger Operation): Clarify previous change.
>>>>>>> 1.574
2005-04-29 Carsten Dominik <dominik@science.uva.nl>
* org.texi: Version 3.08, structure reorganized.