1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove leftover merge conflict marker

Browse Source
This commit is contained in:
Vicențiu Ciorbaru 2017-03-09 16:52:57 +02:00
parent 1b2b209519
commit 1d47bd61d5
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mysql-test/valgrind.supp
View File

@ -1144,7 +1144,6 @@
... ...
fun:pthread_create* fun:pthread_create*
} }
<<<<<<< HEAD
{ {
Memory Leak in loader and valgrind malloc Memory Leak in loader and valgrind malloc