[dss-merge-requests] Dev build failure

[oebuild at]

>From https://git.digitalstrom.org/dss-oe/dss-oe
   1ed9ce9..b4bf671  master     -> origin/master
error: Your local changes to the following files would be overwritten by merge:
	gnupg/yocto-gpgsm.env
Please, commit your changes or stash them before you can merge.
Aborting
Updating 1ed9ce9..b4bf671
[Thu Jun 22 03:30:03 CEST 2017] Preparation for dev build failed