Mercurial > emacs
diff src/config.in @ 108104:17710e3a17df
Remove conflict markers.
author | Juanma Barranquero <lekktu@gmail.com> |
---|---|
date | Sat, 24 Apr 2010 14:33:31 +0200 |
parents | 76692c9b0d43 |
children | 4daf18b3d6e8 |
author | Juanma Barranquero <lekktu@gmail.com> |
---|---|
date | Sat, 24 Apr 2010 14:33:31 +0200 |
parents | 76692c9b0d43 |
children | 4daf18b3d6e8 |