diff options
| author | hubertf <hubertf@pkgsrc.org> | 2000-08-30 04:14:50 +0000 |
|---|---|---|
| committer | hubertf <hubertf@pkgsrc.org> | 2000-08-30 04:14:50 +0000 |
| commit | d86c32023166ac2132c92d451dea02c15068f89b (patch) | |
| tree | 0dd8ec9c733acc7db1d721eb3038029a150a72d1 | |
| parent | 0e5cbd1250f02b55550ddfe4e4ee1c58723172e4 (diff) | |
| download | pkgsrc-d86c32023166ac2132c92d451dea02c15068f89b.tar.gz | |
Remove conflict-clutter that should not have happened.
Noted by Jun Ebihara <jun@soum.co.jp>
| -rw-r--r-- | net/Makefile | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/net/Makefile b/net/Makefile index 81881ed2602..cbf5c5c0d22 100644 --- a/net/Makefile +++ b/net/Makefile @@ -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 |