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

Compare commits

base: 2210788:e6f7a485d83f6201b528f9da0cc5c8785b18b64a
Branches Tags
2210788:main
2210788:test2
2210788:test1
2210788:merge2
2210788:merge1
2210788:mergeconf2
2210788:mergeconf-1
2210788:merge-conf-1
..
compare: 2210788:b4d8831f473914f334d45c7757e45c12e18a50e0
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. "e6f7a485d83f6201b528f9da0cc5c8785b18b64a" and "b4d8831f473914f334d45c7757e45c12e18a50e0" have entirely different histories.
e6f7a485d8 ... b4d8831f47

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

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

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