Remove leftover merge conflict marker

cvicentiu · cvicentiu · commit 07d89fa59c17 · 2017-03-09T16:54:40.000+02:00
diff --git 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

Original file line number	Diff line number	Diff line change
`@@ -1129,7 +1129,6 @@`
`1129`	`1129`	`...`
`1130`	`1130`	`fun:pthread_create*`
`1131`	`1131`	`}`
`1132`		`-<<<<<<< HEAD`
`1133`	`1132`
`1134`	`1133`	`{`
`1135`	`1134`	`Memory Leak in loader and valgrind malloc`