solved merge conf

merge1
Stefan 2024-10-28 13:41:20 +01:00
commit e6f7a485d8
1 changed files with 2 additions and 1 deletions

View File

@ -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;