Repair Issue supertuxkart#3858 (Brake/Reverse on command settings)

Yionnara · Dec 4, 2019 · 12b563d · 12b563d
1 parent e612d5c
commit 12b563d
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/src/states_screens/options/options_screen_device.cpp b/src/states_screens/options/options_screen_device.cpp
@@ -271,10 +271,14 @@ void OptionsScreenDevice::updateInputButtons()
     //I18N: Key binding name
 <<<<<<< HEAD
     renameRow(actions, i++, _("Brake / Reverse"), PA_BRAKE);
+<<<<<<< HEAD
 =======
     renameRow(actions, i++, _("Brake/Reverse"), PA_BRAKE);
 >>>>>>> Repair Issue #3858 (Brake/Reverse on command settings)
 
+=======
+
+>>>>>>> Repair Issue #3858 (Brake/Reverse on command settings)
     //I18N: Key binding name
     renameRow(actions, i++, _("Fire"), PA_FIRE);