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

Compare commits

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

2 Commits
b3688e89fd ... 45e86b3ecd

Author SHA1 Message Date
Stefan 45e86b3ecd solved merge conflict 2024-10-28 14:10:41 +01:00
Stefan edd9d1fe02 merge2 2024-10-28 14:08:00 +01:00
1 changed files with 3 additions and 1 deletions
Show Stats Expand all files Collapse all files

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

@ -10,7 +10,9 @@ public class UI {
int change = 1; int change = 1;
int conflict = 5;
int conflict = 10;
public UI(Banksystem bs) { public UI(Banksystem bs) {
this.bs = bs; this.bs = bs;