From a4cbe4cb0445443d02c5d3c6f788d17367537b92 Mon Sep 17 00:00:00 2001
From: hubertf <hubertf>
Date: Sat, 20 Feb 1999 22:48:24 +0000
Subject: Fix CONFLICTS (remove redundancy, mostly)

---
 net/rsync/Makefile | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'net/rsync')

diff --git a/net/rsync/Makefile b/net/rsync/Makefile
index 7340597103d..5372f02ad58 100644
--- a/net/rsync/Makefile
+++ b/net/rsync/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 1998/11/26 23:34:13 hubertf Exp $
+# $NetBSD: Makefile,v 1.15 1999/02/20 22:48:36 hubertf Exp $
 #
 
 DISTNAME=	rsync-2.2.1
@@ -11,8 +11,6 @@ MASTER_SITES=	ftp://samba.anu.edu.au/pub/rsync/  \
 MAINTAINER=     mycroft@netbsd.org
 HOMEPAGE=	http://samba.anu.edu.au/rsync/
 
-CONFLICTS=	rsync-1.6.9 rsync-2.0.18 rsync-2.1.0 rsync-2.1.1
-
 GNU_CONFIGURE=	yes
 
 .include "../../mk/bsd.prefs.mk"
-- 
cgit v1.2.3