From fee929daa88e9f4ede2e7d66939d67b08c30fc20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Wed, 28 Jan 2026 11:38:45 +0100
Subject: [PATCH] Fixed Merge Conflict

---
 application/models/crm/Prestudent_model.php | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/application/models/crm/Prestudent_model.php b/application/models/crm/Prestudent_model.php
index e8c8eeff8..ad5c3e141 100644
--- a/application/models/crm/Prestudent_model.php
+++ b/application/models/crm/Prestudent_model.php
@@ -784,11 +784,6 @@ class Prestudent_model extends DB_Model
 
 		return $this->execQuery($query, array($person_id));
 	}
-<<<<<<< HEAD
-	
-	public function getMobilityPrestudent(){
-		
-=======
 
 	/**
 	 * Adds a filter to the query builder
@@ -902,6 +897,5 @@ class Prestudent_model extends DB_Model
 		Events::trigger('prestudent_add_filter', $filter);
 
 		return true;
->>>>>>> master
 	}
 }