[Green] Resolve Conflict
Passed
JONATHAN EDWIN
created pipeline for commit
c9ce854e
, finished
2 related merge requests: !173 1606891500 17, !137 Finish: 1606891500-136
7 minutes 7 seconds, queued for 1 seconds