From 0ef46333e1a68130afb16b038852de1344b0e499 Mon Sep 17 00:00:00 2001
From: Sylvester Johansson <scj@archlinux.us>
Date: Mon, 1 Jun 2009 14:31:43 +0200
Subject: fixed broken merge

---
 uzbl.h | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'uzbl.h')

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
-- 
cgit v1.2.3