Merge branch 'test2'
commit
ab724524f6
|
@ -11,7 +11,8 @@ public class UI {
|
||||||
int change = 2;
|
int change = 2;
|
||||||
|
|
||||||
|
|
||||||
int conflict = 100;
|
|
||||||
|
int conflict = 25;
|
||||||
|
|
||||||
|
|
||||||
public UI(Banksystem bs) {
|
public UI(Banksystem bs) {
|
||||||
|
|
Loading…
Reference in New Issue