[dss-merge-requests] Dev build failure

[oebuild at]

>From https://git.digitalstrom.org/dss-oe/dss-oe
   cc4bbe9..e2efad2  master     -> origin/master
error: Your local changes to the following files would be overwritten by merge:
	utilities/code-sign.sh
Please, commit your changes or stash them before you can merge.
Aborting
Updating cc4bbe9..e2efad2
[Sat Jun 24 03:30:03 CEST 2017] Preparation for dev build failed