This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/mate-minidesktop-stretch in repository live-build-x2go. commit b066e85f4d6003298199d0b0914ec44b42e90db7 Merge: 4723e91 01d9a9d Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Sat Jan 19 20:12:32 2019 +0000 Merge commit '01d9a9dface17d15517855a31b4d15796bbf9b80' into feature/mate-minidesktop Conflicts: config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig .../etc/X11/Xsession.d/60x11-set-xbackground | 16 +--------------- config/includes.chroot/etc/network/if-up.d/0430-getxroot | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 15 deletions(-) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/live-build-x2go.git