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

Compare commits

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

3 Commits
b4d8831f47 ... e6f7a485d8

Author SHA1 Message Date
Stefan e6f7a485d8 solved merge conf 2024-10-28 13:41:20 +01:00
Stefan 3e9427de9f mergeconf 2 2024-10-28 13:36:55 +01:00
Stefan 12f368ca1f merge conf 1 2024-10-28 13:35:33 +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

@ -9,7 +9,8 @@ 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;