From 62a9583fffb32e274ee3075430adfeae3b1148e6 Mon Sep 17 00:00:00 2001
From: Jonathan Kelley <jkelleyrtp@gmail.com>
Date: Thu, 4 Jan 2024 16:44:16 -0800
Subject: [PATCH] Fix merge conflict

---
 packages/desktop/headless_tests/events.rs | 6 ------
 packages/desktop/src/lib.rs               | 1 -
 2 files changed, 7 deletions(-)

diff --git a/packages/desktop/headless_tests/events.rs b/packages/desktop/headless_tests/events.rs
index b0aef5f79..4660441a2 100644
--- a/packages/desktop/headless_tests/events.rs
+++ b/packages/desktop/headless_tests/events.rs
@@ -231,12 +231,6 @@ fn app(cx: Scope) -> Element {
                     assert!(event.data.held_buttons().is_empty());
                     assert_eq!(event.data.trigger_button(), Some(dioxus_html::input_data::MouseButton::Primary));
                     received_events.modify(|x| *x + 1)
-                },
-                    assert_eq!(
-                        event.data.trigger_button(),
-                        Some(dioxus_html::input_data::MouseButton::Primary),
-                    );
-                    recieved_events.modify(|x| *x + 1)
                 }
             }
             div {
diff --git a/packages/desktop/src/lib.rs b/packages/desktop/src/lib.rs
index 96c763045..cfc5aeb5e 100644
--- a/packages/desktop/src/lib.rs
+++ b/packages/desktop/src/lib.rs
@@ -147,7 +147,6 @@ pub fn launch_with_props<P: 'static>(root: Component<P>, props: P, cfg: Config)
             _ => {}
         }
 
-        // Update the control flow
         *control_flow = app.control_flow;
     })
 }