fix(fmt): fix format for code

gabm · Feb 20, 2024 · a48ffc1 · a48ffc1
1 parent 194d1cf
commit a48ffc1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/src/configuration.rs b/src/configuration.rs
@@ -140,16 +140,12 @@ impl Configuration {
         if let Some(v) = general.annotation_size_factor {
             self.annotation_size_factor = v;
         }
-<<<<<<< HEAD
         if let Some(v) = general.save_after_copy {
             self.save_after_copy = v;
         }
-||||||| parent of 6fb3d68 (feat: add support for configuring "default-hide-toolbars")
-=======
         if let Some(v) = general.default_hide_toolbars {
             self.default_hide_toolbars = v;
         }
->>>>>>> 6fb3d68 (feat: add support for configuring "default-hide-toolbars")
     }
     fn merge(&mut self, file: Option<ConfigurationFile>, command_line: CommandLine) {
         // input_filename is required and needs to be overwritten

diff --git a/src/sketch_board.rs b/src/sketch_board.rs
@@ -264,7 +264,10 @@ impl SketchBoard {
     }
 
     // Toolbars = Tools Toolbar + Style Toolbar
-    fn handle_toggle_toolbars_display(&mut self, sender: ComponentSender<Self>) -> ToolUpdateResult {
+    fn handle_toggle_toolbars_display(
+        &mut self,
+        sender: ComponentSender<Self>,
+    ) -> ToolUpdateResult {
         sender
             .output_sender()
             .emit(SketchBoardOutput::ToggleToolbarsDisplay);