From 3c34309c8fcd53c4ce67ba77db6bbba803842fd0 Mon Sep 17 00:00:00 2001
From: Paul Menzel <pmenzel@molgen.mpg.de>
Date: Thu, 8 Jun 2017 10:20:49 +0200
Subject: [PATCH] valgrind: Remove git conflict marker

---
 valgrind.be0 | 1 -
 1 file changed, 1 deletion(-)

diff --git a/valgrind.be0 b/valgrind.be0
index 2599a9c54..3513fe2c8 100755
--- a/valgrind.be0
+++ b/valgrind.be0
@@ -8,7 +8,6 @@
 ###############################################################################
 ## The source URL(s) define the location of the sources that will be
 ## downloaded. Version variables may be used to simplify reuse of this bee-file.
->>>>>>> 9ce34ee... valgrind: Add version 3.11.0
 
 SRCURL[0]="http://valgrind.org/downloads/valgrind-${PKGVERSION}.tar.bz2"