Eitan Adler 6de111bb3e Fix conflicts line - glob, not regex ...

Submitted by:	Sulev-Madis "ketas" Silber <madis555@hot.ee>

2012-06-02 04:59:01 +00:00

..

distinfo

…

Makefile

Fix conflicts line - glob, not regex

2012-06-02 04:59:01 +00:00

pkg-descr

…