Resolve tag module conflicts.

1 files changed, 15 insertions, 0 deletions

diff --git a/modules/tag/views/admin_tags.html.php b/modules/tag/views/admin_tags.html.php
index 67ba4d95..9ba80de3 100644
--- a/modules/tag/views/admin_tags.html.php
+++ b/modules/tag/views/admin_tags.html.php
@@ -45,6 +45,7 @@
               <ul>
             <? endif ?>
 
+<<<<<<< HEAD
                 <li>
                   <span class="g-editable g-tag-name" rel="<?= $tag->id ?>"><?= html::clean($tag->name) ?></span>
                   <span class="g-understate">(<?= $tag->count ?>)</span>
@@ -52,6 +53,20 @@
                       class="g-dialog-link g-delete-link g-button">
                     <span class="ui-icon ui-icon-trash"><?= t("Delete this tag") ?></span></a>
                 </li>
+=======
+            </ul>
+            <strong><?= html::clean($current_letter) ?></strong>
+            <ul>
+          <? endif ?>
+
+          <li>
+            <span class="g-editable g-tag-name" rel="<?= $tag->id ?>"><?= html::clean($tag->name) ?></span>
+            <span class="g-understate">(<?= $tag->count ?>)</span>
+            <a href="<?= url::site("admin/tags/form_delete/$tag->id") ?>"
+               class="g-dialog-link g-delete-link g-button">
+                <span class="ui-icon ui-icon-trash"><?= t("Delete this tag") ?></span></a>
+          </li>
+>>>>>>> b976f9b3665771444c30e914fe21cbce5848bd21
 
             <? $column_tag_count++ ?>
             <? $last_letter = $current_letter ?>