Compare commits

..

2 Commits
test2 ... main

Author SHA1 Message Date
Stefan ab724524f6 Merge branch 'test2' 2024-10-28 14:40:47 +01:00
Stefan 7fefb18a07 test1 2024-10-28 14:36:21 +01:00
1 changed files with 1 additions and 0 deletions

View File

@ -11,6 +11,7 @@ public class UI {
int change = 2; int change = 2;
int conflict = 25; int conflict = 25;