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

Compare commits

merge into: 2210788:merge-conf-1
Branches Tags
2210788:main
2210788:test2
2210788:test1
2210788:merge2
2210788:merge1
2210788:mergeconf2
2210788:mergeconf-1
2210788:merge-conf-1
...
pull from: 2210788:main
Branches Tags
2210788:main
2210788:test2
2210788:test1
2210788:merge2
2210788:merge1
2210788:mergeconf2
2210788:mergeconf-1
2210788:merge-conf-1

14 Commits
merge-conf ... main

Author SHA1 Message Date
Stefan ab724524f6 Merge branch 'test2' 2024-10-28 14:40:47 +01:00
Stefan f6df9d33f7 test2 2024-10-28 14:38:04 +01:00
Stefan 7fefb18a07 test1 2024-10-28 14:36:21 +01:00
Stefan 64bc2799e4 changed something 2024-10-28 14:33:58 +01:00
Stefan 45e86b3ecd solved merge conflict 2024-10-28 14:10:41 +01:00
Stefan edd9d1fe02 merge2 2024-10-28 14:08:00 +01:00
Stefan b3688e89fd merge 1 2024-10-28 14:04:14 +01:00
Stefan 9b9105043f adds a commit 2024-10-28 14:01:49 +01:00
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
Stefan b4d8831f47 adds some attribute 2024-10-28 13:32:02 +01:00
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
1 changed files with 7 additions and 1 deletions
Show Stats Expand all files Collapse all files

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

@ -7,7 +7,13 @@ import de.hs_mannheim.informatik.bank.facade.Banksystem;
public class UI {
private Banksystem bs;
Scanner sc = new Scanner(System.in);
int conflict = 1;
int change = 2;
int conflict = 25;
public UI(Banksystem bs) {
this.bs = bs;