Adam Weinberger 3f9e29f7d8 *sigh* This is why even cursory inspections of diffs is a good ... idea. Remove the re-added CVS conflict lines.		2005-04-12 04:22:45 +00:00
..
files
distinfo
Makefile	*sigh* This is why even cursory inspections of diffs is a good	2005-04-12 04:22:45 +00:00
pkg-descr
pkg-plist