Commit e93bc55f authored by Matthieu Muffato's avatar Matthieu Muffato
Browse files

Removed leftovers from a previous conflict

parent 3213e21f
......@@ -145,10 +145,7 @@ sub pipeline_analyses {
-flow_into => {
1 => [ ':////intermediate_result' ],
},
<<<<<<< HEAD
=======
-can_be_empty => 1,
>>>>>>> version/1.9
},
{ -logic_name => 'add_together',
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment