Module Name: src
Committed By: wiz
Date: Sun Aug 25 06:49:40 UTC 2024
Modified Files:
src/external/bsd/pkg_install/dist/add: perform.c
src/external/bsd/pkg_install/dist/lib: license.c version.h
Log Message:
Fix merge conflicts.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/external/bsd/pkg_install/dist/add/perform.c
cvs rdiff -u -r1.12 -r1.13 src/external/bsd/pkg_install/dist/lib/license.c
cvs rdiff -u -r1.21 -r1.22 src/external/bsd/pkg_install/dist/lib/version.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
