Mercurial > emacs
diff src/textprop.c @ 108104:17710e3a17df
Remove conflict markers.
author | Juanma Barranquero <lekktu@gmail.com> |
---|---|
date | Sat, 24 Apr 2010 14:33:31 +0200 |
parents | 51a1add37c3f |
children | 2bc9a0c04c87 376148b31b5e |
author | Juanma Barranquero <lekktu@gmail.com> |
---|---|
date | Sat, 24 Apr 2010 14:33:31 +0200 |
parents | 51a1add37c3f |
children | 2bc9a0c04c87 376148b31b5e |