From 3e9427de9fe3851737a6f4954afb1354ac43425f Mon Sep 17 00:00:00 2001
From: Stefan <whynotuseproton@proton.me>
Date: Mon, 28 Oct 2024 13:36:55 +0100
Subject: [PATCH] mergeconf 2

---
 Bank-Beispiel/src/de/hs_mannheim/informatik/bank/ui/UI.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Bank-Beispiel/src/de/hs_mannheim/informatik/bank/ui/UI.java b/Bank-Beispiel/src/de/hs_mannheim/informatik/bank/ui/UI.java
index 7c256ec..47770f8 100644
--- 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,7 @@ public class UI {
 	Scanner sc = new Scanner(System.in);
 
 	int change = 0;
-	int conflict = 2;
+	int conflict = 0;
 
 	public UI(Banksystem bs) {
 		this.bs = bs;