changeset 1251 | f1fb66b52f41 |
parent 1205 | 6c6c27bcf9ac |
child 1254 | 80dd010d844d |
--- a/components/conflict/conflict.p5m Fri Apr 05 15:35:37 2013 -0700 +++ b/components/conflict/conflict.p5m Tue Apr 09 10:37:15 2013 -0700 @@ -40,11 +40,6 @@ license conflict.copyright license='BSD-like' -dir path=usr -dir path=usr/bin -dir path=usr/share -dir path=usr/share/man -dir path=usr/share/man/man1 file path=usr/bin/conflict file path=usr/share/man/man1/conflict.1