2210788
/
Testate
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: 2210788:b521d30752d8808959189e3f316662e853ed2033
Branches Tags
2210788:main
2210788:test2
2210788:test1
2210788:merge2
2210788:merge1
2210788:mergeconf2
2210788:mergeconf-1
2210788:merge-conf-1
...
compare: 2210788:7c06711460b95ed2ef3be5d1df2bdbcc795d72ce
Branches Tags
2210788:main
2210788:test2
2210788:test1
2210788:merge2
2210788:merge1
2210788:mergeconf2
2210788:mergeconf-1
2210788:merge-conf-1

3 Commits
b521d30752 ... 7c06711460

Author SHA1 Message Date
Stefan 7c06711460 resolves merge conf 2024-10-28 12:33:16 +01:00
Stefan 832178fd37 changes conflict to 2 2024-10-28 12:31:29 +01:00
Stefan 885ee17cad changes conflict to 1 2024-10-28 12:30:31 +01:00
1 changed files with 2 additions and 1 deletions
Show Stats Expand all files Collapse all files

3
Bank-Beispiel/src/de/hs_mannheim/informatik/bank/ui/UI.java
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 = 0;
int conflict = 2;
public UI(Banksystem bs) { public UI(Banksystem bs) {
this.bs = bs; this.bs = bs;