From edd9d1fe023931c1291d7702571aea91b52c8ed0 Mon Sep 17 00:00:00 2001
From: Stefan <whynotuseproton@proton.me>
Date: Mon, 28 Oct 2024 14:08:00 +0100
Subject: [PATCH] merge2

---
 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 4a3bb47..9adc665 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
@@ -10,7 +10,7 @@ public class UI {
 
 	int change = 1;
 
-	int conflict = 0;
+	int conflict = 10;
 
 	public UI(Banksystem bs) {
 		this.bs = bs;