valgrind: Remove git conflict marker

mariux64 · Jun 8, 2017 · 3c34309 · 3c34309
1 parent 021346c
commit 3c34309
Showing 1 changed file with 0 additions and 1 deletion.
diff --git 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"