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:52:57 +0200 |
| commit | 1d47bd61d55e636da1f10a7b22755b2e929c83f5 (patch) | |
| tree | 33dc2c425bf7836a67061c05fb13b15d378b1398 /mysql-test/valgrind.supp | |
| parent | 1b2b209519c1ffd03ec2a1639d64d994e5d9090d (diff) | |
| download | mariadb-git-1d47bd61d55e636da1f10a7b22755b2e929c83f5.tar.gz | |
Remove leftover merge conflict marker
Diffstat (limited to 'mysql-test/valgrind.supp')
| -rw-r--r-- | mysql-test/valgrind.supp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/mysql-test/valgrind.supp b/mysql-test/valgrind.supp index e6aa030859f..bde01a648f9 100644 --- a/mysql-test/valgrind.supp +++ b/mysql-test/valgrind.supp @@ -1144,7 +1144,6 @@ ... fun:pthread_create* } -<<<<<<< HEAD { Memory Leak in loader and valgrind malloc |