summaryrefslogtreecommitdiff
path: root/COPYING
diff options
context:
space:
mode:
authorGalina Shalygina <galashalygina@gmail.com>2016-05-10 22:32:02 +0300
committerGalina Shalygina <galashalygina@gmail.com>2016-05-10 22:32:02 +0300
commitd0e973a3b0fc4384b8aeebfa6509a653b07b7eac (patch)
tree91f56956e012dd5877ea8110234e86c92f36bc4c /COPYING
parentf516b966e131177244941319c553e138fbf9f6ff (diff)
downloadmariadb-git-d0e973a3b0fc4384b8aeebfa6509a653b07b7eac.tar.gz
Fixed merge problems to allow mysql-test suite 'main' to pass
Diffstat (limited to 'COPYING')
0 files changed, 0 insertions, 0 deletions