Mercurial > emacs
diff oldXMenu/ChgPane.c @ 63651:26ce1e6e98e5
Remove conflict markers.
author | Lute Kamstra <lute@gnu.org> |
---|---|
date | Wed, 22 Jun 2005 07:36:03 +0000 |
parents | e8824c4f5f7e |
children | 3861ff8f4bf1 8e5779acd195 |
author | Lute Kamstra <lute@gnu.org> |
---|---|
date | Wed, 22 Jun 2005 07:36:03 +0000 |
parents | e8824c4f5f7e |
children | 3861ff8f4bf1 8e5779acd195 |