[dss-merge-requests] Dev build failure

[oebuild at]

>From https://git.digitalstrom.org/dss-oe/dss-oe
   851911f..5bbc97f  master     -> origin/master
error: Your local changes to the following files would be overwritten by merge:
	targets/dss11e-yocto-devel/conf/local.conf
	targets/dss20-yocto-devel/conf/local.conf
Please, commit your changes or stash them before you can merge.
Aborting
Updating 851911f..5bbc97f
[Thu Apr 28 03:30:11 CEST 2016] Preparation for dev build failed