# HG changeset patch
# User drosofff
# Date 1481568322 18000
# Node ID 4ae2b4c68862bb370302fd7979e1eb931eb69b6d
# Parent  3856d59b4f2a5b6392ffaf9ee79accd5ab9d029c
planemo upload for repository https://github.com/ARTbio/tools-artbio/tree/master/tools/lumpy commit 079a105fb5e798410bfae15590daa79163d885ad

diff -r 3856d59b4f2a -r 4ae2b4c68862 lumpy.xml
--- a/lumpy.xml	Mon Dec 12 08:48:47 2016 -0500
+++ b/lumpy.xml	Mon Dec 12 13:45:22 2016 -0500
@@ -72,7 +72,6 @@
                 meanB=\$(cat meandevB.txt | sed s/mean:// | sed -r s/stdev:.+//) &&
                 stdevA=\$(cat meandevA.txt | sed -r s/mean:.+stdev://) &&
                 stdevB=\$(cat meandevB.txt | sed -r s/mean:.+stdev://) &&
-<<<<<<< HEAD
                 lumpy -mw $seq_method.additional_params.mw -tt $seq_method.additional_params.tt
                     #if $output_format == "BEDPE":
                         -b