[dss-merge-requests] Dev build failure

[oebuild at builder.localdomain]

>From https://git.digitalstrom.org/dss-oe/dss-oe
   2daa4aa..1179e4f  master     -> origin/master
error: Your local changes to the following files would be overwritten by merge:
	scripts/create-rootfs-usb-update-image
Please, commit your changes or stash them before you can merge.
Aborting
Updating 2daa4aa..1179e4f
[Fri Apr 20 03:30:02 CEST 2018] Preparation for dev build failed