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