blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-16 22:42:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed merge with stashed files in system/messages/htmlWriteTemplate.php

Browse Source
This commit is contained in:
Paolo
2020-02-13 12:49:57 +01:00
parent c54579ef7d
commit a4bfdfb4a0
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/views/system/messages/htmlWriteTemplate.php
-5
View File
@@ -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; ?>