From 1d47bd61d55e636da1f10a7b22755b2e929c83f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vicen=C8=9Biu=20Ciorbaru?= <vicentiu@mariadb.org>
Date: Thu, 9 Mar 2017 16:52:57 +0200
Subject: Remove leftover merge conflict marker

---
 mysql-test/valgrind.supp | 1 -
 1 file changed, 1 deletion(-)

(limited to 'mysql-test/valgrind.supp')

diff --git a/mysql-test/valgrind.supp b/mysql-test/valgrind.supp
index e6aa030859f..bde01a648f9 100644
--- 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
-- 
cgit v1.2.1