Conflict, conflict, conflict. Who wants a conflict?
authordownsj <downsj@openbsd.org>
Sun, 15 Dec 1996 22:21:02 +0000 (22:21 +0000)
committerdownsj <downsj@openbsd.org>
Sun, 15 Dec 1996 22:21:02 +0000 (22:21 +0000)
commit502e43dd0646fe2af5d6d57c083fda6b2d112d32
treec11afd8f5190fc59e4f2e9ede0d128d0603aac1e
parent40248eced16a3ade83b83a09d22bb308e8803774
Conflict, conflict, conflict.  Who wants a conflict?
gnu/usr.bin/texinfo/Makefile.in
gnu/usr.bin/texinfo/info/Makefile.in