solved merge conflict

2024-10-28 14:10:41 +01:00 · 2024-10-28 14:10:41 +01:00 · 45e86b3ecd
parent b3688e89fd edd9d1fe02
commit 45e86b3ecd
1 changed files with 3 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
@ -10,7 +10,9 @@ public class UI {

 	int change = 1;

-	int conflict = 5;
+
+	int conflict = 10;
+

 	public UI(Banksystem bs) {
 		this.bs = bs;