Fix conflict marker.

This commit is contained in:
ajacoutot 2011-09-26 15:10:34 +00:00
parent 161eb70ddc
commit 98afa6b86e
2 changed files with 4 additions and 4 deletions

View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.2 2011/09/26 14:41:57 jasper Exp $
# $OpenBSD: Makefile,v 1.3 2011/09/26 15:10:34 ajacoutot Exp $
COMMENT= terminal emulation library
GNOME_PROJECT= vte
GNOME_VERSION= 0.30.0
REVISION= 0
REVISION= 1
PKGNAME= vte3-${GNOME_VERSION}

View File

@ -1,6 +1,6 @@
@comment $OpenBSD: PLIST,v 1.2 2011/09/26 14:41:57 jasper Exp $
@comment $OpenBSD: PLIST,v 1.3 2011/09/26 15:10:34 ajacoutot Exp $
@conflict devel/vte,-main,gtk2-<=0.28.2
@conflict devel/vte,-pty-helper-*
@conflict vte-ptyhelper-*
@pkgpath devel/vte,-main
@bin bin/vte2_90
include/vte-2.90/