Commit af0aabdc authored by Giovannoni Laurent's avatar Giovannoni Laurent

Merge branch 'master' into 'develop'

# Conflicts:
#   MaarchCapture.php
parents 51051789 01d34c86
Pipeline #2343 failed with stage
in 2 minutes and 46 seconds
......@@ -224,7 +224,10 @@ 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;
......@@ -414,4 +417,4 @@ $Result = $Capture->processWorkflow($inputArgs);
throw new Exception($errmsg);
}*/
?>
\ No newline at end of file
?>
\ 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