Remove leftover merge conflict marker

cvicentiu · cvicentiu · commit 1d47bd61d55e · 2017-03-09T16:52:57.000+02:00
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

Original file line number	Diff line number	Diff line change
`@@ -1144,7 +1144,6 @@`
`1144`	`1144`	`...`
`1145`	`1145`	`fun:pthread_create*`
`1146`	`1146`	`}`
`1147`		`-<<<<<<< HEAD`
`1148`	`1147`
`1149`	`1148`	`{`
`1150`	`1149`	`Memory Leak in loader and valgrind malloc`