fix issues with bullethell example

fastjengine · Jul 4, 2021 · 99569e2 · 99569e2
1 parent 75bbdf9
commit 99569e2
Showing 1 changed file with 3 additions and 0 deletions.
diff --git 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;