Don't know how this broke.
jdarwood007 commited on 2020-12-07 17:48:33
Showing 1 changed files, with 0 additions and 8 deletions.
- sd_template/SimpleDesk-Post.template.php 4d58fd5..ebd9165
| ... | ... |
@@ -623,12 +623,6 @@ function template_ticket_additional_options() |
| 623 | 623 |
template_show_attachments(); |
| 624 | 624 |
template_add_attachments(); |
| 625 | 625 |
|
| 626 |
-<<<<<<< HEAD |
|
| 627 |
- if (empty($context['current_attachments']) && empty($context['ticket_form']['do_attach'])) |
|
| 628 |
- {
|
|
| 629 |
- echo ' |
|
| 630 |
- </div>'; |
|
| 631 |
-======= |
|
| 632 | 626 |
echo ' |
| 633 | 627 |
</div>'; |
| 634 | 628 |
|
| ... | ... |
@@ -650,9 +644,7 @@ function template_show_attachments() |
| 650 | 644 |
global $context, $txt; |
| 651 | 645 |
|
| 652 | 646 |
if (empty($context['current_attachments'])) |
| 653 |
->>>>>>> smf21 |
|
| 654 | 647 |
return; |
| 655 |
- } |
|
| 656 | 648 |
|
| 657 | 649 |
echo ' |
| 658 | 650 |
<dl id="postAttachment"> |
| 659 | 651 |