landry 4c2052a022 Set @conflict markers, both ports install bin/deliver. ... Reported by naddy@.		2011-01-14 22:17:03 +00:00
..
patches
pkg	Set @conflict markers, both ports install bin/deliver.	2011-01-14 22:17:03 +00:00
distinfo
Makefile	Set @conflict markers, both ports install bin/deliver.	2011-01-14 22:17:03 +00:00