solved merge conf
commit
e6f7a485d8
|
@ -9,7 +9,8 @@ public class UI {
|
||||||
Scanner sc = new Scanner(System.in);
|
Scanner sc = new Scanner(System.in);
|
||||||
|
|
||||||
int change = 0;
|
int change = 0;
|
||||||
int conflict = 3;
|
|
||||||
|
int conflict = 0;
|
||||||
|
|
||||||
public UI(Banksystem bs) {
|
public UI(Banksystem bs) {
|
||||||
this.bs = bs;
|
this.bs = bs;
|
||||||
|
|
Loading…
Reference in New Issue