[dss-merge-requests] Dev build failure

[oebuild at]

>From https://git.digitalstrom.org/dss-oe/dss-oe
   ec8778e..6dcab8b  master     -> origin/master
error: Your local changes to the following files would be overwritten by merge:
	targets/dss11-1gb-t1-yocto-devel/conf/local.conf
Please, commit your changes or stash them before you can merge.
Aborting
Updating ec8778e..6dcab8b
[Fri Dec 18 03:30:02 CET 2015] Preparation for dev build failed