zhuk 223f6a5dfb Fix conflict marker that prevented installation of qt5-html meta-package.		2017-02-15 09:55:20 +00:00
..
pkg	Fix conflict marker that prevented installation of qt5-html meta-package.	2017-02-15 09:55:20 +00:00
distinfo
Makefile	Fix conflict marker that prevented installation of qt5-html meta-package.	2017-02-15 09:55:20 +00:00