Module Name:    src
Committed By:   wiz
Date:           Sat Apr 10 22:59:46 UTC 2021

Modified Files:
        src/external/bsd/pkg_install/dist/add: main.c

Log Message:
Fix merge bug.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/pkg_install/dist/add/main.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/pkg_install/dist/add/main.c
diff -u src/external/bsd/pkg_install/dist/add/main.c:1.3 src/external/bsd/pkg_install/dist/add/main.c:1.4
--- src/external/bsd/pkg_install/dist/add/main.c:1.3	Sat Apr 10 19:49:59 2021
+++ src/external/bsd/pkg_install/dist/add/main.c	Sat Apr 10 22:59:46 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: main.c,v 1.3 2021/04/10 19:49:59 nia Exp $	*/
+/*	$NetBSD: main.c,v 1.4 2021/04/10 22:59:46 wiz Exp $	*/
 
 #if HAVE_CONFIG_H
 #include "config.h"
@@ -7,7 +7,7 @@
 #if HAVE_SYS_CDEFS_H
 #include <sys/cdefs.h>
 #endif
-__RCSID("$NetBSD");
+__RCSID("$NetBSD: main.c,v 1.4 2021/04/10 22:59:46 wiz Exp $");
 
 /*
  *

Reply via email to