Remove leftover merge conflict marker

07d89fa5 · Vicențiu Ciorbaru · 5aacb861 · 07d89fa5
Commit 07d89fa5 authored Mar 09, 2017 by Vicențiu Ciorbaru
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

mysql-test/valgrind.supp mysql-test/valgrind.supp +0 -1

No files found.
--- a/mysql-test/valgrind.supp
+++ b/mysql-test/valgrind.supp
@@ -1129,7 +1129,6 @@
   ...
   fun:pthread_create*
 }
-<<<<<<< HEAD
 {
   Memory Leak in loader and valgrind malloc