From 160a139fb7c07b856b4d4daad3365169421f4759 Mon Sep 17 00:00:00 2001
From: Oscar Wiberg <oscarwiberg@Oscars-MacBook-Air-4.local>
Date: Sat, 1 Feb 2025 15:07:10 +0100
Subject: [PATCH] merge fix

---
 src/states/PlayState.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/states/PlayState.java b/src/states/PlayState.java
index ce12563..f07c961 100644
--- a/src/states/PlayState.java
+++ b/src/states/PlayState.java
@@ -235,7 +235,7 @@ public class PlayState extends GameState {
 			//			if (movingSpeed < 100) {
 			isPowerUpActive = true;			
 //			num = getRandom();
-			num = 1;
+			num = 0;
 			System.out.println(num);
 
 			//			}
-- 
GitLab