[src/pgoyette-compat]: src/external/bsd/cron/dist Resolve conflict, remove ma...

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

details:   https://anonhg.NetBSD.org/src/rev/21aea02b926a
branches:  pgoyette-compat
changeset: 830623:21aea02b926a
user:      pgoyette <pgoyette%NetBSD.org@localhost>
date:      Thu Sep 06 11:12:14 2018 +0000

description:
Resolve conflict, remove marker.  Not sure how this snuck past me.

diffstat:

 external/bsd/cron/dist/entry.c |  8 ++------
 1 files changed, 2 insertions(+), 6 deletions(-)

diffs (22 lines):

diff -r e0384b81f40f -r 21aea02b926a external/bsd/cron/dist/entry.c
--- a/external/bsd/cron/dist/entry.c    Thu Sep 06 08:22:10 2018 +0000
+++ b/external/bsd/cron/dist/entry.c    Thu Sep 06 11:12:14 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: entry.c,v 1.7.14.2 2018/09/06 06:51:44 pgoyette Exp $  */
+/*     $NetBSD: entry.c,v 1.7.14.3 2018/09/06 11:12:14 pgoyette Exp $  */
 
 /*
  * Copyright 1988,1990,1993,1994 by Paul Vixie
@@ -26,11 +26,7 @@
 #if 0
 static char rcsid[] = "Id: entry.c,v 1.17 2004/01/23 18:56:42 vixie Exp";
 #else
-<<<<<<< entry.c
-__RCSID("$NetBSD: entry.c,v 1.7.14.2 2018/09/06 06:51:44 pgoyette Exp $");
-=======
-__RCSID("$NetBSD: entry.c,v 1.7.14.2 2018/09/06 06:51:44 pgoyette Exp $");
->>>>>>> 1.10
+__RCSID("$NetBSD: entry.c,v 1.7.14.3 2018/09/06 11:12:14 pgoyette Exp $");
 #endif
 #endif