diff options
| author |  Sylvester Johansson <scj@archlinux.us> | 2009-06-01 14:31:43 +0200 |
|---|---|---|
| committer | Sylvester Johansson <scj@archlinux.us> | 2009-06-01 14:31:43 +0200 |
| commit | 0ef46333e1a68130afb16b038852de1344b0e499 (patch) | |
| tree | c538c9f86dcedc8a6cafcec16cd09d4fe05d79e2 /uzbl.h | |
| parent | 16bb4ad6493cb7e5b4c15014670106428085deb3 (diff) | |
fixed broken merge
Diffstat (limited to 'uzbl.h')
| -rw-r--r-- | uzbl.h | 3 |
1 files changed, 0 insertions, 3 deletions
@@ -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 |