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

Compare commits

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

No commits in common. "main" and "mergeconf2" have entirely different histories.
main ... mergeconf2

1 changed files with 2 additions and 6 deletions
Show Stats Expand all files Collapse all files

8
Bank-Beispiel/src/de/hs_mannheim/informatik/bank/ui/UI.java
View File

@ -8,12 +8,8 @@ public class UI {
private Banksystem bs; private Banksystem bs;
Scanner sc = new Scanner(System.in); Scanner sc = new Scanner(System.in);
int change = 2; int change = 0;
int conflict = 0;
int conflict = 25;
public UI(Banksystem bs) { public UI(Banksystem bs) {
this.bs = bs; this.bs = bs;