Mercurial > emacs
diff oldXMenu/SetFrz.c @ 70111:9f68cc95e2da
Remove conflict marker.
author | Romain Francoise <romain@orebokech.com> |
---|---|
date | Wed, 19 Apr 2006 06:29:47 +0000 (2006-04-19) |
parents | e8a3fb527b77 |
children | ce127a46b1ca d04d8ccb3c41 c5406394f567 |