Mercurial > emacs
diff src/strftime.c @ 43168:3d510ec26d69
fix conflict
author | Per Abrahamsen <abraham@dina.kvl.dk> |
---|---|
date | Thu, 07 Feb 2002 17:33:40 +0000 |
parents | e4835ecdffbc |
children | 38d2cf408e27 |
author | Per Abrahamsen <abraham@dina.kvl.dk> |
---|---|
date | Thu, 07 Feb 2002 17:33:40 +0000 |
parents | e4835ecdffbc |
children | 38d2cf408e27 |