From 8b92ba4cd943daf2d7f73a6de5c1fda328cec9e3 Mon Sep 17 00:00:00 2001
From: Vlad <vlad@gas.by>
Date: Wed, 11 Aug 2010 14:27:25 +0300
Subject: [PATCH] small fix

---
 xscreensaver/hacks/screenhack.c |    5 -----
 1 file changed, 5 deletions(-)

diff --git a/xscreensaver/hacks/screenhack.c b/xscreensaver/hacks/screenhack.c
index 799bf84..add27fc 100644
--- a/xscreensaver/hacks/screenhack.c
+++ b/xscreensaver/hacks/screenhack.c
@@ -685,13 +685,8 @@ run_screenhack_table (Display *dpy,
 	   dbus_message_unref (msg); 
 	   continue;
       }
-<<<<<<< HEAD
-      dbus_message_unref (msg); 
-=======
 */
-      
       /*dbus_message_unref (msg);*/
->>>>>>> 392e81dc1f7b4a895b1838457380c376a80f9186
     }
 
   ft->free_cb (dpy, window, closure);
-- 
1.7.9.5