yquake2/yquake2remaster
0
0
Fork 0
mirror of https://github.com/yquake2/yquake2remaster.git synced 2025-03-26 04:41:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

Resolve conflict in quake2-start.sh

Browse source
This commit is contained in:
Yamagi Burmeister 2012-04-30 09:04:35 +02:00
parent 38da4b8eee
commit cdaf1ef5c4
1 changed files with 0 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
stuff/quake2-start.sh
View file

@ -24,15 +24,6 @@ ulimit -c unlimited
# run quake 2
./quake2 "$@"
<<<<<<< HEAD
# if gnome-screensaver was running..
if [ -n "$GSC_PID" ]; then
echo "reactivating gnome screensaver"
kill "$GSC_PID"
fi
=======
>>>>>>> f3edcfc... Reactivate gnome-screensaver and unclutter in the reverse order they are deactivated.
# Continue unclutter
if ps auxww | grep -q 'unclutter'; then
echo 'reactivating unclutter'