diff options
author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-03-09 16:52:57 +0200 |
---|---|---|
committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-03-09 16:54:40 +0200 |
commit | 07d89fa59c1734b5a963943dcb93ade0c4e92e48 (patch) | |
tree | 91cc23343f5d4c7c6a3ded6cd092bf9222689d4f /support-files/mysql-log-rotate.sh | |
parent | 5aacb861f2e84e1f45d72bf34fdaffa0904a9f5b (diff) | |
download | mariadb-git-07d89fa59c1734b5a963943dcb93ade0c4e92e48.tar.gz |
Remove leftover merge conflict marker
Diffstat (limited to 'support-files/mysql-log-rotate.sh')
0 files changed, 0 insertions, 0 deletions