FIX pb witch conflict

parent af0aabdc
Pipeline #2344 passed with stage
in 2 minutes and 56 seconds
......@@ -224,10 +224,6 @@ case 'continue':
# Store in session for modules that will acces through requests
$_SESSION['capture'] = $Capture;
<<<<<<< MaarchCapture.php
=======
>>>>>>> MaarchCapture.php
#echo "MaarchCapture continue: " . print_r($commandArgs,true) . PHP_EOL;
......@@ -417,4 +413,4 @@ $Result = $Capture->processWorkflow($inputArgs);
throw new Exception($errmsg);
}*/
?>
\ No newline at end of file
?>
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