Mercurial > emacs
diff oldXMenu/insque.c @ 98651:28e7a63d1369
Delete leftover conflict markers.
author | Romain Francoise <romain@orebokech.com> |
---|---|
date | Sun, 12 Oct 2008 09:17:13 +0000 |
parents | 3765d76f7fa8 |
children | a04b5f26a401 |
author | Romain Francoise <romain@orebokech.com> |
---|---|
date | Sun, 12 Oct 2008 09:17:13 +0000 |
parents | 3765d76f7fa8 |
children | a04b5f26a401 |