Compare commits
No commits in common. "main" and "merge-conf-1" have entirely different histories.
main
...
merge-conf
|
|
@ -7,13 +7,7 @@ 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 change = 2;
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
int conflict = 25;
|
|
||||||
|
|
||||||
|
|
||||||
public UI(Banksystem bs) {
|
public UI(Banksystem bs) {
|
||||||
this.bs = bs;
|
this.bs = bs;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue