aargh, unbreak. thanks CVS!

2012-03-20 10:05:48 +00:00 · 2012-03-20 10:05:48 +00:00 · a6f472d092
commit a6f472d092
parent 3fd65040f2
1 changed files with 1 additions and 5 deletions
--- a/www/drupal6/core/pkg/PLIST
+++ b/www/drupal6/core/pkg/PLIST
@ -1,8 +1,4 @@
-<<<<<<< PLIST
-@comment $OpenBSD: PLIST,v 1.10 2012/03/18 16:15:16 sthen Exp $
-=======
-@comment $OpenBSD: PLIST,v 1.10 2012/03/18 16:15:16 sthen Exp $
->>>>>>> 1.9
+@comment $OpenBSD: PLIST,v 1.11 2012/03/20 10:05:48 sthen Exp $
@option no-default-conflict
@conflict drupal->=6,<7
@owner ${DRUPAL_OWNER}