Merge branch 'main' of github.com:openpatch/scratch-for-java

Author: mikebarkmin

src/org/openpatch/scratch/Window.java

@@ -4,7 +4,7 @@
 
 public class Window {
 
-  public static final int[] DEBUG_COLOR = { 255, 0, 0 };
+  public static final int[] DEBUG_COLOR = {255, 0, 0};
   private static Window instance;
 
   public Window() {
@@ -34,12 +34,12 @@ public static Window getInstance() {
   }
 
   /**
-   * Gets the seconds passed since the last frame.
-<<<<<<< HEAD
-   * 
-=======
+   * Gets the seconds passed since the last frame. <<<<<<< HEAD
+   *
+   * <p>=======
+   *
+   * <p>>>>>>>> c0eac5706fdcd98090dbc99a6d5b478a5c0bd3b3
    *
->>>>>>> c0eac5706fdcd98090dbc99a6d5b478a5c0bd3b3
    * @return seconds since last frame
    */
   public float getDeltaTime() {
@@ -72,7 +72,7 @@ public void setStage(Stage stage) {
 
   /**
    * @deprecated since 4.0.0. Use setStage instead.
-   * @param name  Name of the stage
+   * @param name Name of the stage
    * @param stage A stage object
    */
   public void addStage(String name, Stage stage) {