Module Name: src Committed By: pgoyette Date: Thu Sep 6 11:12:14 UTC 2018
Modified Files: src/external/bsd/cron/dist [pgoyette-compat]: entry.c Log Message: Resolve conflict, remove marker. Not sure how this snuck past me. To generate a diff of this commit: cvs rdiff -u -r1.7.14.2 -r1.7.14.3 src/external/bsd/cron/dist/entry.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/external/bsd/cron/dist/entry.c diff -u src/external/bsd/cron/dist/entry.c:1.7.14.2 src/external/bsd/cron/dist/entry.c:1.7.14.3 --- src/external/bsd/cron/dist/entry.c:1.7.14.2 Thu Sep 6 06:51:44 2018 +++ src/external/bsd/cron/dist/entry.c Thu Sep 6 11:12:14 2018 @@ -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