Skip to content

Commit 1bbf4ce

Browse files
committed
Merge branch 'main' of github.com:openpatch/scratch-for-java
2 parents b9803da + ec72de7 commit 1bbf4ce

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

src/org/openpatch/scratch/Window.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
public class Window {
66

7-
public static final int[] DEBUG_COLOR = { 255, 0, 0 };
7+
public static final int[] DEBUG_COLOR = {255, 0, 0};
88
private static Window instance;
99

1010
public Window() {
@@ -34,12 +34,12 @@ public static Window getInstance() {
3434
}
3535

3636
/**
37-
* Gets the seconds passed since the last frame.
38-
<<<<<<< HEAD
39-
*
40-
=======
37+
* Gets the seconds passed since the last frame. <<<<<<< HEAD
38+
*
39+
* <p>=======
40+
*
41+
* <p>>>>>>>> c0eac5706fdcd98090dbc99a6d5b478a5c0bd3b3
4142
*
42-
>>>>>>> c0eac5706fdcd98090dbc99a6d5b478a5c0bd3b3
4343
* @return seconds since last frame
4444
*/
4545
public float getDeltaTime() {
@@ -72,7 +72,7 @@ public void setStage(Stage stage) {
7272

7373
/**
7474
* @deprecated since 4.0.0. Use setStage instead.
75-
* @param name Name of the stage
75+
* @param name Name of the stage
7676
* @param stage A stage object
7777
*/
7878
public void addStage(String name, Stage stage) {

0 commit comments

Comments
 (0)