svn commit: r342335 - head/devel/subversion

[Olli Hauer]

Author: ohauer
Date: Sun Feb  2 16:44:11 2014
New Revision: 342335
URL: http://svnweb.freebsd.org/changeset/ports/342335
QAT: https://qat.redports.org/buildarchive/r342335/

Log:
  - fix conflict

Modified:
  head/devel/subversion/Makefile

Modified: head/devel/subversion/Makefile
==============================================================================
--- head/devel/subversion/Makefile	Sun Feb  2 16:40:08 2014	(r342334)
+++ head/devel/subversion/Makefile	Sun Feb  2 16:44:11 2014	(r342335)
@@ -4,7 +4,7 @@
 MAINTAINER=	lev at FreeBSD.org
 COMMENT=	Version control system
 
-_CONFLICTS_INSTALL=	subversion-1.[^8].[0-9]* \
+CONFLICTS_INSTALL=	subversion-1.[^8].[0-9]* \
 			subversion1[^8]-1.[^8].[0-9]*
 
 USE_RC_SUBR=	svnserve