diff options
| author | Chad Kieffer <ckieffer@gmail.com> | 2009-10-18 22:45:13 -0600 |
|---|---|---|
| committer | Chad Kieffer <ckieffer@gmail.com> | 2009-10-18 22:45:13 -0600 |
| commit | c2b32cc2b802034a98051b713a3f06c09dcb3f34 (patch) | |
| tree | c5ccea3fb7e8a32e3a4f82e70940173d0c984a40 | |
| parent | 6a7db5bea15c346d069d42fef173a0f99393bf3d (diff) | |
Resolve merge conflict.
| -rw-r--r-- | modules/tag/views/admin_tags.html.php | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/modules/tag/views/admin_tags.html.php b/modules/tag/views/admin_tags.html.php index 9ba80de3..dc9deb1f 100644 --- a/modules/tag/views/admin_tags.html.php +++ b/modules/tag/views/admin_tags.html.php @@ -20,7 +20,7 @@ <div class="g-block"> <h1> <?= t("Tag Admin") ?> </h1> - + <div class="g-block-content"> <table id="g-tag-admin"> <caption class="g-understate"> @@ -44,8 +44,6 @@ <strong><?= html::clean($current_letter) ?></strong> <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> @@ -53,7 +51,6 @@ 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> @@ -66,8 +63,6 @@ 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 ?> <? endforeach /* $tags */ ?> |