This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/openbox-magic-pixel-workaround in repository live-build-x2go. commit afff588e8a6d76ab5039edb7e767c3951a8e03fb Merge: 25e5041 a8afba5 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Tue Feb 6 12:24:31 2018 +0100 Merge branch 'feature/openbox' into feature/openbox-magic-pixel-workaround Conflicts: config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig .../lib/live/config/2260-getsshhostkeysfrommedia | 157 ++++++++++++--------- .../lib/live/config/2270-getsshclientkeysfrommedia | 113 ++++++++------- 2 files changed, 155 insertions(+), 115 deletions(-) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/live-build-x2go.git