Mercurial > emacs
diff AUTHORS @ 28855:1be9a502caca
Cleaned some left over bogus conflict markers.
author | Stefan Monnier <monnier@iro.umontreal.ca> |
---|---|
date | Wed, 10 May 2000 21:37:06 +0000 |
parents | b3e40f2a7784 |
children | fa166d86d278 |
author | Stefan Monnier <monnier@iro.umontreal.ca> |
---|---|
date | Wed, 10 May 2000 21:37:06 +0000 |
parents | b3e40f2a7784 |
children | fa166d86d278 |