Mercurial > emacs
diff .gitignore @ 108104:17710e3a17df
Remove conflict markers.
author | Juanma Barranquero <lekktu@gmail.com> |
---|---|
date | Sat, 24 Apr 2010 14:33:31 +0200 |
parents | 9a2d92bd2a3e |
children | 6719c75fa3ac |
author | Juanma Barranquero <lekktu@gmail.com> |
---|---|
date | Sat, 24 Apr 2010 14:33:31 +0200 |
parents | 9a2d92bd2a3e |
children | 6719c75fa3ac |