From d093983c69b339b240b9edb1c2e487ae3803b9b5 Mon Sep 17 00:00:00 2001
From: Yeedo <yeedo@tutanota.com>
Date: Mon, 29 Apr 2019 22:23:31 +0100
Subject: [PATCH] cargo fmt, also remove a stray `<<<<HEAD` thing

Former-commit-id: 2be13ebd752d8f90fb22358597878dc8dd8df1ef
---
 voxygen/src/hud/mod.rs | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/voxygen/src/hud/mod.rs b/voxygen/src/hud/mod.rs
index 576c252b73..f59212dd3f 100644
--- a/voxygen/src/hud/mod.rs
+++ b/voxygen/src/hud/mod.rs
@@ -2,7 +2,7 @@ mod chat;
 
 use crate::{
     render::Renderer,
-    settings::{Settings, ControlSettings},
+    settings::{ControlSettings, Settings},
     ui::{self, ScaleMode, ToggleButton, Ui},
     window::{Event as WinEvent, Key, Window},
     GlobalState,
@@ -1025,11 +1025,7 @@ impl Hud {
                 .press_images(self.imgs.bag_press, self.imgs.bag_open_press)
                 .w_h(420.0 / 10.0, 480.0 / 10.0)
                 .set(self.ids.bag, ui_widgets);
-<<<<<<< HEAD
-                Text::new(&format!("{:?}", self.settings.controls.bag))
-=======
-            Text::new("B")
->>>>>>> 4be2d5d8f791addfbeaab680d1699c4684069825
+            Text::new(&format!("{:?}", self.settings.controls.bag))
                 .bottom_right_with_margins_on(self.ids.bag, 0.0, 0.0)
                 .font_size(10)
                 .font_id(self.font_metamorph)
@@ -1891,7 +1887,7 @@ impl Hud {
             WinEvent::SettingsChanged => {
                 self.settings = global_state.settings.clone();
                 true
-            },
+            }
             _ => false,
         }
     }
@@ -1929,6 +1925,7 @@ fn get_help_text(cs: &ControlSettings) -> String {
         format!("{:?} = Character window\n", cs.character_window),
         format!("{:?} = Social\n", cs.social),
         format!("{:?} = Spellbook\n", cs.spellbook),
-        format!("{:?} = Settings\n", cs.settings)
-    ].concat()
-}
\ No newline at end of file
+        format!("{:?} = Settings\n", cs.settings),
+    ]
+    .concat()
+}