merge 1
parent
9b9105043f
commit
b3688e89fd
|
@ -10,7 +10,7 @@ public class UI {
|
|||
|
||||
int change = 1;
|
||||
|
||||
int conflict = 0;
|
||||
int conflict = 5;
|
||||
|
||||
public UI(Banksystem bs) {
|
||||
this.bs = bs;
|
||||
|
|
Loading…
Reference in New Issue