[dss-merge-requests] Dev build failure

[oebuild at]

>From https://git.digitalstrom.org/dss-oe/dss-oe
   22b6b01..cc287df  master     -> origin/master
error: Your local changes to the following files would be overwritten by merge:
	yocto/dS/meta-digitalstrom-devel/recipes-connectivity/upnpbeacon/upnpbeacon_git.bb
Please, commit your changes or stash them before you can merge.
Aborting
Updating 22b6b01..cc287df
[Tue Sep 20 08:50:18 CEST 2016] Preparation for dev build failed