Mercurial > emacs
comparison nt/emacs.rc @ 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 | 5f64e921ac71 |
children | 212dbe6254e8 |
comparison
equal
deleted
inserted
replaced
28854:a5c81109bc31 | 28855:1be9a502caca |
---|