dealing with stashed changes

Yao-class-cpp-studio · Jan 21, 2024 · 0a84852 · 0a84852
1 parent 2d2aaa7
commit 0a84852
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/src/GameBall/logic/player_input.h b/src/GameBall/logic/player_input.h
@@ -23,14 +23,11 @@ class PlayerInputController {
  private:
   GameBall *app_;
   PlayerInput input_{};
-<<<<<<< Updated upstream
-=======
   bool R_pressed_before = false;  // indicate whether R has been pressed before
   bool R_pressed_now = false;
   bool T_pressed_before = false;
   bool T_pressed_now = false;
   int count_chances = 0, count_halt = 0;
->>>>>>> Stashed changes
 };
 
 }  // namespace GameBall::Logic