[dss-merge-requests] Dev build failure

[oebuild at]

>From https://git.digitalstrom.org/dss-oe/dss-oe
   e9e4861..71fc8d2  master     -> origin/master
error: Your local changes to the following files would be overwritten by merge:
	targets/dss11e-yocto-rescue-devel/conf/local.conf
	targets/dss11e-yocto-rescue-testing/conf/local.conf
Please, commit your changes or stash them before you can merge.
Aborting
Updating e9e4861..71fc8d2
[Fri Jan 22 11:15:12 CET 2016] Preparation for dev build failed