Mercurial > emacs
comparison src/strftime.c @ 108104:17710e3a17df
Remove conflict markers.
| author | Juanma Barranquero <lekktu@gmail.com> |
|---|---|
| date | Sat, 24 Apr 2010 14:33:31 +0200 |
| parents | e90d04cd455a |
| children | 95d0cdf160ea 2bc9a0c04c87 |
comparison
equal
deleted
inserted
replaced
| 108103:01ca94871a56 | 108104:17710e3a17df |
|---|