Fix merge error

This commit is contained in:
Hanno Becker 2018-03-08 13:31:44 +00:00
parent a3389ebb09
commit 6f486a6fb5

View file

@ -881,8 +881,5 @@ rm -rf "$OUT_OF_SOURCE_DIR"
msg "Done, cleaning up"
cleanup
<<<<<<< HEAD
=======
final_report
>>>>>>> development-restricted