From fa29633c61717c84b283c2ef01e1877d0d5766ac Mon Sep 17 00:00:00 2001
From: StarToaster <startoaster23@gmail.com>
Date: Thu, 20 Oct 2022 14:03:07 -0400
Subject: [PATCH] Fixed missing merge things.

---
 examples/image.rs      | 14 -----------
 examples/nine_patch.rs | 14 -----------
 examples/tabs/tabs.rs  | 56 ------------------------------------------
 examples/text_box.rs   | 29 ----------------------
 examples/todo/todo.rs  | 30 ----------------------
 5 files changed, 143 deletions(-)

diff --git a/examples/image.rs b/examples/image.rs
index 11e66a0..7e626bc 100644
--- a/examples/image.rs
+++ b/examples/image.rs
@@ -38,24 +38,10 @@ fn startup(
 
 fn main() {
     BevyApp::new()
-<<<<<<< HEAD
-        .insert_resource(WindowDescriptor {
-            width: 1270.0,
-            height: 720.0,
-            title: String::from("UI Example"),
-            ..Default::default()
-        })
-        .insert_resource(ImageSettings::default_nearest())
-        .add_plugins(DefaultPlugins)
-        .add_plugin(BevyKayakUIPlugin)
-        .add_startup_system(startup)
-        .run();
-=======
         .insert_resource(ImageSettings::default_nearest())
         .add_plugins(DefaultPlugins)
         .add_plugin(ContextPlugin)
         .add_plugin(KayakWidgets)
         .add_startup_system(startup)
         .run()
->>>>>>> exp/main
 }
diff --git a/examples/nine_patch.rs b/examples/nine_patch.rs
index c81088c..14b4c19 100644
--- a/examples/nine_patch.rs
+++ b/examples/nine_patch.rs
@@ -60,24 +60,10 @@ fn startup(
 
 fn main() {
     BevyApp::new()
-<<<<<<< HEAD
-        .insert_resource(WindowDescriptor {
-            width: 1270.0,
-            height: 720.0,
-            title: String::from("UI Example"),
-            ..Default::default()
-        })
-        .insert_resource(ImageSettings::default_nearest())
-        .add_plugins(DefaultPlugins)
-        .add_plugin(BevyKayakUIPlugin)
-        .add_startup_system(startup)
-        .run();
-=======
         .insert_resource(ImageSettings::default_nearest())
         .add_plugins(DefaultPlugins)
         .add_plugin(ContextPlugin)
         .add_plugin(KayakWidgets)
         .add_startup_system(startup)
         .run()
->>>>>>> exp/main
 }
diff --git a/examples/tabs/tabs.rs b/examples/tabs/tabs.rs
index cc1311c..95eec95 100644
--- a/examples/tabs/tabs.rs
+++ b/examples/tabs/tabs.rs
@@ -16,48 +16,6 @@ fn startup(
     mut font_mapping: ResMut<FontMapping>,
     asset_server: Res<AssetServer>,
 ) {
-<<<<<<< HEAD
-    commands.spawn_bundle(UICameraBundle::new());
-
-    font_mapping.set_default(asset_server.load("roboto.kayak_font"));
-
-    let theme = TabTheme {
-        primary: Default::default(),
-        bg: Color::new(0.176, 0.227, 0.255, 1.0),
-        fg: Color::new(0.286, 0.353, 0.392, 1.0),
-        focus: Color::new(0.388, 0.474, 0.678, 0.5),
-        text: ColorState {
-            normal: Color::new(0.949, 0.956, 0.968, 1.0),
-            hovered: Color::new(0.650, 0.574, 0.669, 1.0),
-            active: Color::new(0.949, 0.956, 0.968, 1.0),
-        },
-        active_tab: ColorState {
-            normal: Color::new(0.286, 0.353, 0.392, 1.0),
-            hovered: Color::new(0.246, 0.323, 0.352, 1.0),
-            active: Color::new(0.196, 0.283, 0.312, 1.0),
-        },
-        inactive_tab: ColorState {
-            normal: Color::new(0.176, 0.227, 0.255, 1.0),
-            hovered: Color::new(0.16, 0.21, 0.23, 1.0),
-            active: Color::new(0.196, 0.283, 0.312, 1.0),
-        },
-        tab_height: 22.0,
-    };
-
-    let context = BevyContext::new(|context| {
-        render! {
-            <App>
-                <Window position={(50.0, 50.0)} size={(600.0, 300.0)} title={"Tabs Example".to_string()}>
-                    <TabThemeProvider initial_theme={theme}>
-                        <TabDemo />
-                    </TabThemeProvider>
-                </Window>
-            </App>
-        }
-    });
-
-    commands.insert_resource(context);
-=======
     font_mapping.set_default(asset_server.load("roboto.kayak_font"));
 
     commands.spawn(UICameraBundle::new());
@@ -103,28 +61,14 @@ fn startup(
     }
 
     commands.insert_resource(widget_context);
->>>>>>> exp/main
 }
 
 fn main() {
     BevyApp::new()
-<<<<<<< HEAD
-        .insert_resource(WindowDescriptor {
-            width: 1270.0,
-            height: 720.0,
-            title: String::from("UI Example"),
-            ..Default::default()
-        })
-        .add_plugins(DefaultPlugins)
-        .add_plugin(BevyKayakUIPlugin)
-        .add_startup_system(startup)
-        .run();
-=======
         .insert_resource(ImageSettings::default_nearest())
         .add_plugins(DefaultPlugins)
         .add_plugin(ContextPlugin)
         .add_plugin(KayakWidgets)
         .add_startup_system(startup)
         .run()
->>>>>>> exp/main
 }
diff --git a/examples/text_box.rs b/examples/text_box.rs
index 76e38dc..038cf2f 100644
--- a/examples/text_box.rs
+++ b/examples/text_box.rs
@@ -111,21 +111,6 @@ fn startup(
     mut font_mapping: ResMut<FontMapping>,
     asset_server: Res<AssetServer>,
 ) {
-<<<<<<< HEAD
-    commands.spawn_bundle(UICameraBundle::new());
-
-    font_mapping.set_default(asset_server.load("roboto.kayak_font"));
-
-    let context = BevyContext::new(|context| {
-        render! {
-            <App>
-                <TextBoxExample />
-            </App>
-        }
-    });
-
-    commands.insert_resource(context);
-=======
     font_mapping.set_default(asset_server.load("roboto.kayak_font"));
 
     commands.spawn(UICameraBundle::new());
@@ -152,27 +137,13 @@ fn startup(
         </KayakAppBundle>
     }
     commands.insert_resource(widget_context);
->>>>>>> exp/main
 }
 
 fn main() {
     BevyApp::new()
-<<<<<<< HEAD
-        .insert_resource(WindowDescriptor {
-            width: 1270.0,
-            height: 720.0,
-            title: String::from("UI Example"),
-            ..Default::default()
-        })
-        .add_plugins(DefaultPlugins)
-        .add_plugin(BevyKayakUIPlugin)
-        .add_startup_system(startup)
-        .run();
-=======
         .add_plugins(DefaultPlugins)
         .add_plugin(ContextPlugin)
         .add_plugin(KayakWidgets)
         .add_startup_system(startup)
         .run()
->>>>>>> exp/main
 }
diff --git a/examples/todo/todo.rs b/examples/todo/todo.rs
index df441ea..f995060 100644
--- a/examples/todo/todo.rs
+++ b/examples/todo/todo.rs
@@ -34,35 +34,6 @@ fn startup(
     mut font_mapping: ResMut<FontMapping>,
     asset_server: Res<AssetServer>,
 ) {
-<<<<<<< HEAD
-    commands.spawn_bundle(UICameraBundle::new());
-
-    font_mapping.set_default(asset_server.load("roboto.kayak_font"));
-
-    let context = BevyContext::new(|context| {
-        render! {
-            <App>
-                <TodoApp />
-            </App>
-        }
-    });
-
-    commands.insert_resource(context);
-}
-
-fn main() {
-    BevyApp::new()
-        .insert_resource(WindowDescriptor {
-            width: 1270.0,
-            height: 720.0,
-            title: String::from("UI Example"),
-            ..Default::default()
-        })
-        .add_plugins(DefaultPlugins)
-        .add_plugin(BevyKayakUIPlugin)
-        .add_startup_system(startup)
-        .run();
-=======
     font_mapping.set_default(asset_server.load("roboto.kayak_font"));
 
     commands.spawn(UICameraBundle::new());
@@ -102,5 +73,4 @@ fn main() {
         .insert_non_send_resource(TodoList::new())
         .add_startup_system(startup)
         .run()
->>>>>>> exp/main
 }
-- 
GitLab