diff options
author | unknown <brian@zim.(none)> | 2005-03-25 14:12:46 -0800 |
---|---|---|
committer | unknown <brian@zim.(none)> | 2005-03-25 14:12:46 -0800 |
commit | 2c353624fb781ba89806be8fe78461cd565cc7e7 (patch) | |
tree | de43897030ade96672b1f13edc100261d0ffcc4e /SSL/cacert.pem | |
parent | e3528e0d1cd7e36158db09c0d50894a48df9f3bf (diff) | |
parent | 0310e2a770680593de3b4724d08d6836455b3d91 (diff) | |
download | mariadb-git-2c353624fb781ba89806be8fe78461cd565cc7e7.tar.gz |
fixed conflict making embedded server with libmysqld
libmysqld/Makefile.am:
Fixed conflict
Diffstat (limited to 'SSL/cacert.pem')
0 files changed, 0 insertions, 0 deletions