1 files changed, 0 insertions, 3 deletions
diff --git a/uzbl.h b/uzbl.h
index bbc1f39..846dad6 100644
--- a/uzbl.h
+++ b/uzbl.h
@@ -425,12 +425,9 @@ static void
 set_var(WebKitWebView *page, GArray *argv);
 
 static void
-<<<<<<< HEAD:uzbl.h
-=======
 act_bind(WebKitWebView *page, GArray *argv);
 
 static void
->>>>>>> dieterbe/experimental:uzbl.h
 act_dump_config();
 
 static void