small fix

[xscreensaver] / xscreensaver / hacks / screenhack.c

diff --git a/xscreensaver/hacks/screenhack.c b/xscreensaver/hacks/screenhack.c
index 799bf84..add27fc 100644 (file)
--- 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);