From 99569e27f608ea53174970a5bc17cea96e3801e2 Mon Sep 17 00:00:00 2001 From: lucasstarsz Date: Sun, 27 Jun 2021 21:17:00 -0400 Subject: [PATCH] fix issues with bullethell example --- .../java/tech/fastj/example/bullethell/scenes/GameScene.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/example/java/tech/fastj/example/bullethell/scenes/GameScene.java b/src/example/java/tech/fastj/example/bullethell/scenes/GameScene.java index ac04ae58..a34d1be1 100644 --- a/src/example/java/tech/fastj/example/bullethell/scenes/GameScene.java +++ b/src/example/java/tech/fastj/example/bullethell/scenes/GameScene.java @@ -18,7 +18,10 @@ import java.awt.Color; import java.awt.Font; import java.awt.event.KeyEvent; +<<<<<<< HEAD import java.nio.file.Path; +======= +>>>>>>> 944c9fc (fix issues with bullethell example) import java.util.HashMap; import java.util.Map;