fixes leftover conflict
Passed
Cristian Lalescu
created pipeline for commit
1381dbea
, finished
1 related merge request: !46 Feature/warning free
18 minutes 40 seconds, queued for 1 seconds