svn commit: r307111 - head/x11-toolkits/open-motif

[Cy Schubert]

Author: cy
Date: Tue Nov  6 23:35:00 2012
New Revision: 307111
URL: http://svnweb.freebsd.org/changeset/ports/307111

Log:
  Remove redundant conflict.
  
  Feature safe:	yes

Modified:
  head/x11-toolkits/open-motif/Makefile

Modified: head/x11-toolkits/open-motif/Makefile
==============================================================================
--- head/x11-toolkits/open-motif/Makefile	Tue Nov  6 23:31:28 2012	(r307110)
+++ head/x11-toolkits/open-motif/Makefile	Tue Nov  6 23:35:00 2012	(r307111)
@@ -19,7 +19,7 @@ LIB_DEPENDS=	png15:${PORTSDIR}/graphics/
 		jpeg:${PORTSDIR}/graphics/jpeg
 
 MAKE_JOBS_UNSAFE=	yes
-CONFLICTS=	lesstif-[0-9]* open-motif-[0-0]*
+CONFLICTS=	lesstif-[0-9]*
 # WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 WRKSRC=		${WRKDIR}/motif-${PORTVERSION}