[Midnightbsd-cvs] mports: Makefile: remove stray CONFLICTS

[laffer1 at midnightbsd.org]

Log Message:
-----------
remove stray CONFLICTS

Modified Files:
--------------
    mports/devel/git:
        Makefile (r1.6 -> r1.7)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/devel/git/Makefile,v
retrieving revision 1.6
retrieving revision 1.7
diff -L devel/git/Makefile -L devel/git/Makefile -u -r1.6 -r1.7
--- devel/git/Makefile
+++ devel/git/Makefile
@@ -28,8 +28,6 @@
 LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2 \
 		curl.5:${PORTSDIR}/ftp/curl 
 
-CONFLICTS=	cogito-0.1[012] 
-
 MAN1= 	git-am.1 git-apply.1 git-archimport.1 git-archive.1 git-bisect.1 \
 	git-blame.1 git-branch.1 git-bundle.1 git-cat-file.1 git-check-attr.1 \
 	git-checkout-index.1 git-checkout.1 git-cherry-pick.1 git-cherry.1 \