Mercurial > emacs
diff src/strftime.c @ 109936:e1a5ebb1ce1c
lisp/ChangeLog: Remove merge markers.
author | Juanma Barranquero <lekktu@gmail.com> |
---|---|
date | Thu, 19 Aug 2010 01:32:39 +0200 |
parents | e90d04cd455a |
children | 95d0cdf160ea 2bc9a0c04c87 |
author | Juanma Barranquero <lekktu@gmail.com> |
---|---|
date | Thu, 19 Aug 2010 01:32:39 +0200 |
parents | e90d04cd455a |
children | 95d0cdf160ea 2bc9a0c04c87 |