Fix merge conflicts

[bsdgames-darwin.git] / cribbage / extern.c

diff --git a/cribbage/extern.c b/cribbage/extern.c
index 12e23baec625bc7bd5b5196a7398c0d7cdb3724a..01b3edd4bbe9ef29cb2d8871b1b38578c3f1fff2 100644 (file)
--- a/cribbage/extern.c
+++ b/cribbage/extern.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: extern.c,v 1.6 2002/12/06 01:48:24 thorpej Exp $       */
+/*     $NetBSD: extern.c,v 1.7 2003/08/07 09:37:10 agc Exp $   */
 
 /*-
  * Copyright (c) 1980, 1993
@@ -12,11 +12,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *     This product includes software developed by the University of
- *     California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -38,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)extern.c   8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: extern.c,v 1.6 2002/12/06 01:48:24 thorpej Exp $");
+__RCSID("$NetBSD: extern.c,v 1.7 2003/08/07 09:37:10 agc Exp $");
 #endif
 #endif /* not lint */