Compare commits
No commits in common. "main" and "test2" have entirely different histories.
|
@ -11,7 +11,6 @@ public class UI {
|
||||||
int change = 2;
|
int change = 2;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
int conflict = 25;
|
int conflict = 25;
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue