From 3f6caa76dcff04261c4ce14bb21d2aecc60bab8c Mon Sep 17 00:00:00 2001 From: YNH Webdev Date: Sun, 22 Sep 2013 19:14:19 +0200 Subject: [PATCH] Fix confict --- examples/widgetapp/base_page.e | 8 -------- 1 file changed, 8 deletions(-) diff --git a/examples/widgetapp/base_page.e b/examples/widgetapp/base_page.e index 2df1609c..ef527af7 100644 --- a/examples/widgetapp/base_page.e +++ b/examples/widgetapp/base_page.e @@ -19,19 +19,11 @@ feature do create container.make_multi_control ("container") container.add_class ("container") -<<<<<<< HEAD - create navbar.make_navbar ("Sample Page") - navbar.nav.add_control (create {WSF_BASIC_CONTROL}.make_with_body ("a", "href=%"/%"", "Home")) - navbar.nav.add_control (create {WSF_BASIC_CONTROL}.make_with_body ("a", "href=%"/grid%"", "Grid")) - navbar.nav.add_control (create {WSF_BASIC_CONTROL}.make_with_body ("a", "href=%"/repeater%"", "Repeater")) - navbar.nav_right.add_control (create {WSF_BASIC_CONTROL}.make_with_body ("a", "href=%"#%"", "About")) -======= create navbar.make_navbar_with_brand ("Example") navbar.add_list_element (create {WSF_BASIC_CONTROL}.make_with_body ("a", "href=%"/%"", "Home")) navbar.add_list_element (create {WSF_BASIC_CONTROL}.make_with_body ("a", "href=%"/grid%"", "Grid")) navbar.add_list_element (create {WSF_BASIC_CONTROL}.make_with_body ("a", "href=%"/repeater%"", "Repeater")) navbar.add_list_element_right (create {WSF_BASIC_CONTROL}.make_with_body ("a", "href=%"#%"", "About")) ->>>>>>> 87569ccee9ea1d7cdda723e98276cdafaeb93300 container.add_control (navbar) control := container end