[dss-merge-requests] Dev build failure

[oebuild at builder.localdomain]

>From https://git.digitalstrom.org/dss-oe/dss-oe
   805e1f8..56cce88  master     -> origin/master
 * [new branch]      MR_fix_dailydev -> origin/MR_fix_dailydev
error: Your local changes to the following files would be overwritten by merge:
	scripts/dailydev.sh
Please, commit your changes or stash them before you can merge.
Aborting
Updating 805e1f8..56cce88
[Mon Apr  8 11:18:14 CEST 2019] Preparation for dev build failed