cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

oops, fix CVS conflict in $OpenBSD$ line.

Browse Source
This commit is contained in:
sthen 2012-03-18 16:18:34 +00:00
parent 0ac32ec156
commit 91045ce898
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
www/drupal6/core/Makefile
View File

@ -1,8 +1,4 @@
<<<<<<< Makefile
# $OpenBSD: Makefile,v 1.27 2012/03/18 16:15:16 sthen Exp $
=======
# $OpenBSD: Makefile,v 1.27 2012/03/18 16:15:16 sthen Exp $
>>>>>>> 1.26
# $OpenBSD: Makefile,v 1.28 2012/03/18 16:18:34 sthen Exp $
COMMENT = powerful content management system
MAINTAINER = Marc Espie <espie@openbsd.org>