Remove leftover merge conflict marker

MariaDB · Mar 9, 2017 · 1d47bd6 · 1d47bd6
1 parent 1b2b209
commit 1d47bd6
Showing 1 changed file with 0 additions and 1 deletion.
diff --git 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