[src/trunk]: src/lib/libc/time fix mergeo

[dholland <dholland%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/b1dcb31b70ef
branches:  trunk
changeset: 996261:b1dcb31b70ef
user:      dholland <dholland%NetBSD.org@localhost>
date:      Sun Jan 27 02:40:49 2019 +0000

description:
fix mergeo

diffstat:

 lib/libc/time/asctime.c |  6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diffs (20 lines):

diff -r 63958bff1793 -r b1dcb31b70ef lib/libc/time/asctime.c
--- a/lib/libc/time/asctime.c   Sun Jan 27 02:35:49 2019 +0000
+++ b/lib/libc/time/asctime.c   Sun Jan 27 02:40:49 2019 +0000
@@ -1,6 +1,4 @@
-/*     $NetBSD: asctime.c,v 1.26 2019/01/27 02:08:35 pgoyette Exp $    */
-
-/* asctime and asctime_r a la POSIX and ISO C, except pad years before 1000.  */
+/*     $NetBSD: asctime.c,v 1.27 2019/01/27 02:40:49 dholland Exp $    */
 
 /* asctime and asctime_r a la POSIX and ISO C, except pad years before 1000.  */
 
@@ -20,7 +18,7 @@
 #if 0
 static char    elsieid[] = "@(#)asctime.c      8.5";
 #else
-__RCSID("$NetBSD: asctime.c,v 1.26 2019/01/27 02:08:35 pgoyette Exp $");
+__RCSID("$NetBSD: asctime.c,v 1.27 2019/01/27 02:40:49 dholland Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */