From cdaf1ef5c48b6a0dad319b8ddaed6fa735afe733 Mon Sep 17 00:00:00 2001
From: Yamagi Burmeister <yamagi@yamagi.org>
Date: Mon, 30 Apr 2012 09:04:35 +0200
Subject: [PATCH] Resolve conflict in quake2-start.sh

---
 stuff/quake2-start.sh | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/stuff/quake2-start.sh b/stuff/quake2-start.sh
index 53726ee7..219ca8c9 100755
--- a/stuff/quake2-start.sh
+++ b/stuff/quake2-start.sh
@@ -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'