mergeconf 2
parent
b4d8831f47
commit
3e9427de9f
|
@ -9,7 +9,7 @@ public class UI {
|
|||
Scanner sc = new Scanner(System.in);
|
||||
|
||||
int change = 0;
|
||||
int conflict = 2;
|
||||
int conflict = 0;
|
||||
|
||||
public UI(Banksystem bs) {
|
||||
this.bs = bs;
|
||||
|
|
Loading…
Reference in New Issue