X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=xscreensaver%2Fhacks%2Fscreenhack.c;fp=xscreensaver%2Fhacks%2Fscreenhack.c;h=add27fc50cb2af765fb5573c1eaa79adf31652e0;hb=8b92ba4cd943daf2d7f73a6de5c1fda328cec9e3;hp=799bf84702e70f584f2c6a5afaf5285457990694;hpb=c213fefddba7a483e7c076932aea88c096f084a4;p=xscreensaver

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