landry 4c2052a022 Set @conflict markers, both ports install bin/deliver. ...

Reported by naddy@.

2011-01-14 22:17:03 +00:00

..

files

Import archiveopteryx 3.1.3:

2011-01-09 09:36:21 +00:00

patches

Import archiveopteryx 3.1.3:

2011-01-09 09:36:21 +00:00

pkg

Set @conflict markers, both ports install bin/deliver.

2011-01-14 22:17:03 +00:00

distinfo

Import archiveopteryx 3.1.3:

2011-01-09 09:36:21 +00:00

Makefile

Set @conflict markers, both ports install bin/deliver.

2011-01-14 22:17:03 +00:00