kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove conflict-clutter that should not have happened.

Browse source 
Noted by Jun Ebihara <jun@soum.co.jp>
This commit is contained in:
hubertf 2000-08-30 04:14:50 +00:00
parent 0e5cbd1250
commit d86c320231
1 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
net/Makefile
View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.150 2000/08/27 20:43:26 hubertf Exp $
# $NetBSD: Makefile,v 1.151 2000/08/30 04:14:50 hubertf Exp $
# FreeBSD Id: Makefile,v 1.117 1997/08/16 03:11:52 gpalmer Exp
#
@ -23,13 +23,8 @@
SUBDIR += coda_doc
SUBDIR += coda_intro
SUBDIR += coda_server
<<<<<<< Makefile
SUBDIR += delegate
SUBDIR += ddclient
=======
SUBDIR += ddclient
SUBDIR += delegate
>>>>>>> 1.142
SUBDIR += dhid
SUBDIR += dip
SUBDIR += dlint