Skip to content
Permalink
Browse files

Remove leftover merge conflict marker

  • Loading branch information...
cvicentiu committed Mar 9, 2017
1 parent 1b2b209 commit 1d47bd61d55e636da1f10a7b22755b2e929c83f5
Showing with 0 additions and 1 deletion.
  1. +0 −1 mysql-test/valgrind.supp
@@ -1144,7 +1144,6 @@
...
fun:pthread_create*
}
<<<<<<< HEAD

{
Memory Leak in loader and valgrind malloc

0 comments on commit 1d47bd6

Please sign in to comment.
You can’t perform that action at this time.