[X2Go-Commits] [live-build-x2go] 22/35: openbox configuration refined and documented

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch feature/fvwm
in repository live-build-x2go.

commit 7274f5e36c4cacea1821864218d5fed755cd89a3
Author: Stefan Baur (BAUR-ITCS) <kontakt at baur-itcs.de>
Date:   Thu Dec 22 15:56:38 2016 +0100

    openbox configuration refined and documented
---
 config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig b/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig
index 77cfc16..4f1b98e 100755
--- a/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig
+++ b/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig
@@ -15,6 +15,7 @@ sed -i -e 's#<number>4</number>#<number>1</number>#' /etc/xdg/openbox/rc.xml
 # disable OpenBox context menu (would be accessible in xinerama)
 sed -i -e '\#<action name="ShowMenu"><menu>[a-z-]*-menu</menu></action>#d' /etc/xdg/openbox/rc.xml
 # make sure OpenBox maximizes X2GoClient on launch and hides window decorations
+<<<<<<< HEAD
 =======
 echo -n " x2gothinclientconfig"
 =======
@@ -22,6 +23,8 @@ echo -n " x2go-thinclientconfig"
 >>>>>>> fa6f730... Startup display message changed
 
 >>>>>>> dd779e0... typofix, and different invocation of pulseaudio
+=======
+>>>>>>> df4ed87... openbox configuration refined and documented
 sed -i -e '\#<applications>#a<application title="X2Go Client" type="normal">' -e '\#<applications>#a<decor>no</decor>' -e '\#<applications>#a</application>' /etc/xdg/openbox/rc.xml
 
 cat >/home/user/.xsession <<XSESSION

--
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