Module name: ports
Changes by: brad@cvs.openbsd.org 2014/08/22 20:25:34

Modified files:
databases/mariadb: Makefile
databases/mariadb/pkg: PLIST-main

Log message:
Add a conflict marker for MySQL server to the MariaDB client sub-package as
some files moved around between the two ports/packages and their respective
sub-packages.

ok sthen@