Remove leftover merge conflict marker

2017-03-09 16:52:57 +02:00 · 2017-03-09 16:52:57 +02:00 · 1d47bd61d5
commit 1d47bd61d5
parent 1b2b209519
1 changed files with 0 additions and 1 deletions
--- 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