[src/pgoyette-compat]: src/usr.bin/gzip Another missed pseudo-conflict

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

details:   https://anonhg.NetBSD.org/src/rev/37ffa1c6b143
branches:  pgoyette-compat
changeset: 446180:37ffa1c6b143
user:      pgoyette <pgoyette%NetBSD.org@localhost>
date:      Mon Nov 26 12:05:55 2018 +0000

description:
Another missed pseudo-conflict

diffstat:

 usr.bin/gzip/gzip.c |  8 ++------
 1 files changed, 2 insertions(+), 6 deletions(-)

diffs (22 lines):

diff -r e18e624e1823 -r 37ffa1c6b143 usr.bin/gzip/gzip.c
--- a/usr.bin/gzip/gzip.c       Mon Nov 26 11:38:34 2018 +0000
+++ b/usr.bin/gzip/gzip.c       Mon Nov 26 12:05:55 2018 +0000
@@ -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 */
 
 /*