resolves merge conf

mergeconf-1
Stefan 2024-10-28 12:33:16 +01:00
commit 7c06711460
1 changed files with 2 additions and 1 deletions

View File

@ -7,7 +7,8 @@ import de.hs_mannheim.informatik.bank.facade.Banksystem;
public class UI { public class UI {
private Banksystem bs; private Banksystem bs;
Scanner sc = new Scanner(System.in); Scanner sc = new Scanner(System.in);
int conflict = 1;
int conflict = 2;
public UI(Banksystem bs) { public UI(Banksystem bs) {
this.bs = bs; this.bs = bs;