Merge branch 'test2'

test2
2024-10-28 14:40:47 +01:00 · 2024-10-28 14:38:04 +01:00
1 changed files with 2 additions and 1 deletions
--- a/Bank-Beispiel/src/de/hs_mannheim/informatik/bank/ui/UI.java
+++ b/Bank-Beispiel/src/de/hs_mannheim/informatik/bank/ui/UI.java
@ -11,7 +11,8 @@ public class UI {
 	int change = 2;


-	int conflict = 100;
+
+	int conflict = 25;


 	public UI(Banksystem bs) {
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