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 a263f5d719b93c72079e81c9a819298db380cd1a Merge: 9de90f2 5fe4c03 Author: Stefan Baur <kontakt@baur-itcs.de> Date: Mon Nov 20 02:37:27 2017 +0100 Merge branch 'feature/openbox-stretch' into feature/mate-minidesktop-stretch Conflicts: config/archives/x2go.list.chroot config/package-lists/desktop.list.chroot | 3 +++ config/package-lists/firmware.list.chroot | 2 +- config/package-lists/live.list.chroot | 1 - config/package-lists/ntfs.list.chroot | 2 +- config/package-lists/x2go.list.chroot | 5 +---- 5 files changed, 6 insertions(+), 7 deletions(-) -- Alioth's /srv/git/code.x2go.org/live-build-x2go.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/live-build-x2go.git