Mercurial > emacs
diff etc/SERVICE @ 98651:28e7a63d1369
Delete leftover conflict markers.
author | Romain Francoise <romain@orebokech.com> |
---|---|
date | Sun, 12 Oct 2008 09:17:13 +0000 |
parents | 5a8fd913621c |
children | e6fdae9180d4 ef719132ddfa |
author | Romain Francoise <romain@orebokech.com> |
---|---|
date | Sun, 12 Oct 2008 09:17:13 +0000 |
parents | 5a8fd913621c |
children | e6fdae9180d4 ef719132ddfa |