solved merge conf

2024-10-28 13:41:20 +01:00 · 2024-10-28 13:41:20 +01:00 · e6f7a485d8
parent 12f368ca1f 3e9427de9f
commit e6f7a485d8
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
@ -9,7 +9,8 @@ public class UI {
 	Scanner sc = new Scanner(System.in);

 	int change = 0;
-	int conflict = 3;
+
+	int conflict = 0;

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