brad da5fee2215 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@

2014-08-23 02:25:34 +00:00

..

patches

Update to MariaDB 10.0.13.

2014-08-19 16:42:40 +00:00

pkg

Add a conflict marker for MySQL server to the MariaDB client sub-package as

2014-08-23 02:25:34 +00:00

distinfo

Update to MariaDB 10.0.13.

2014-08-19 16:42:40 +00:00

Makefile

Add a conflict marker for MySQL server to the MariaDB client sub-package as

2014-08-23 02:25:34 +00:00