Module Name: src
Committed By: pgoyette
Date: Mon Nov 26 12:05:55 UTC 2018
Modified Files:
src/usr.bin/gzip [pgoyette-compat]: gzip.c
Log Message:
Another missed pseudo-conflict
To generate a diff of this commit:
cvs rdiff -u -r1.112.2.3 -r1.112.2.4 src/usr.bin/gzip/gzip.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/gzip/gzip.c
diff -u src/usr.bin/gzip/gzip.c:1.112.2.3 src/usr.bin/gzip/gzip.c:1.112.2.4
--- src/usr.bin/gzip/gzip.c:1.112.2.3 Mon Nov 26 01:52:54 2018
+++ src/usr.bin/gzip/gzip.c Mon Nov 26 12:05:55 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: gzip.c,v 1.112.2.3 2018/11/26 01:52:54 pgoyette Exp $ */
+/* $NetBSD: gzip.c,v 1.112.2.4 2018/11/26 12:05:55 pgoyette Exp $ */
/*
* Copyright (c) 1997, 1998, 2003, 2004, 2006, 2008, 2009, 2010, 2011, 2015, 2017
@@ -31,11 +31,7 @@
#ifndef lint
__COPYRIGHT("@(#) Copyright (c) 1997, 1998, 2003, 2004, 2006, 2008,\
2009, 2010, 2011, 2015, 2017 Matthew R. Green. All rights reserved.");
-<<<<<<< gzip.c
-__RCSID("$NetBSD: gzip.c,v 1.112.2.3 2018/11/26 01:52:54 pgoyette Exp $");
-=======
-__RCSID("$NetBSD: gzip.c,v 1.112.2.3 2018/11/26 01:52:54 pgoyette Exp $");
->>>>>>> 1.116
+__RCSID("$NetBSD: gzip.c,v 1.112.2.4 2018/11/26 12:05:55 pgoyette Exp $");
#endif /* not lint */
/*
