From a4bfdfb4a0e590ffdbb9c48b3acc5b26245984b0 Mon Sep 17 00:00:00 2001
From: Paolo <bison@technikum-wien.at>
Date: Thu, 13 Feb 2020 12:49:57 +0100
Subject: [PATCH] Fixed merge with stashed files in
 system/messages/htmlWriteTemplate.php

---
 application/views/system/messages/htmlWriteTemplate.php | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/application/views/system/messages/htmlWriteTemplate.php b/application/views/system/messages/htmlWriteTemplate.php
index 77bc168a7..64a8c8236 100644
--- a/application/views/system/messages/htmlWriteTemplate.php
+++ b/application/views/system/messages/htmlWriteTemplate.php
@@ -162,12 +162,7 @@
 							<textarea id="tinymcePreview"></textarea>
 						</div>
 
-<<<<<<< Updated upstream
-					<?php echo $persons; ?>
-					<?php echo $prestudenten; ?>
-=======
 					<?php echo $recipients_ids; ?>
->>>>>>> Stashed changes
 					<?php echo $relationmessage_id; ?>
 					<?php echo $type; ?>