From 62798eedf46b26b9e64cd5d01a05b1af1f4bf372 Mon Sep 17 00:00:00 2001
From: mycroft <mycroft>
Date: Sat, 4 Jul 1998 05:53:12 +0000
Subject: Add CONFLICTS.

---
 x11/Xaw3d/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'x11/Xaw3d')

diff --git a/x11/Xaw3d/Makefile b/x11/Xaw3d/Makefile
index 78df7eb4503..ebd7615dfbc 100644
--- a/x11/Xaw3d/Makefile
+++ b/x11/Xaw3d/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 1998/07/04 05:50:24 mycroft Exp $
+# $NetBSD: Makefile,v 1.15 1998/07/04 05:53:12 mycroft Exp $
 # FreeBSD Id: Makefile,v 1.14 1997/06/19 09:33:26 asami Exp
 #
 
@@ -9,7 +9,7 @@ MASTER_SITE_SUBDIR=	widgets/Xaw3d/R6.3
 
 MAINTAINER=	tron@netbsd.org
 
-CONFLICTS=	Xaw-Xpm-1.1
+CONFLICTS=	Xaw-Xpm-1.1 Xaw3d-1.3
 
 USE_IMAKE=	yes
 WRKSRC=		${WRKDIR}/xc/lib/Xaw3d
-- 
cgit v1.2.3