From e26bce2cf7d21d78e59c09ba16c46097c6d4ef0b Mon Sep 17 00:00:00 2001
From: Alexei Karpenko <karpen_ko@hotmail.com>
Date: Tue, 10 Jun 2025 14:14:32 +0200
Subject: [PATCH] removed merge text from code

---
 application/models/ressource/Stundensatz_model.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/application/models/ressource/Stundensatz_model.php b/application/models/ressource/Stundensatz_model.php
index 553bdd20b..c8ee367d8 100644
--- a/application/models/ressource/Stundensatz_model.php
+++ b/application/models/ressource/Stundensatz_model.php
@@ -150,4 +150,3 @@ class Stundensatz_model extends DB_Model
 		return $default_stundensatz;
 	}
 }
-==== BASE ====