Reverting the merges due to unsuccessfull conflict resolvement.

[osqa.git] / forum / skins / default / templates / node / comments.html

diff --git a/forum/skins/default/templates/node/comments.html b/forum/skins/default/templates/node/comments.html
index 5fea00c030dca680d5ba7bc4fc1025b86ded234f..49d529a0aded38e532ead3e1afb282781781ebb4 100644 (file)
--- a/forum/skins/default/templates/node/comments.html
+++ b/forum/skins/default/templates/node/comments.html
@@ -23,7 +23,7 @@
                 {% endif %}\r
                 {% if comment.can_convert %}\r
                     <a rel="nofollow" id="comment-{{ comment.id }}-convert" href="{% url convert_comment id=comment.id %}" title="{% trans "Convert comment to answer" %}"\r
-                        class="ajax-command comment-convert confirm" rel="nofollow">{% trans "Convert comment to answer" %}</a>\r
+                        class="ajax-command comment-convert confirm" rel="nofollow"> </a>\r
                 {% endif %}\r
                     \r
 \r
@@ -70,7 +70,7 @@
                     <a id="comment-%ID%-delete" href="%DELETE_URL%"\r
                         class="ajax-command comment-delete" rel="nofollow"> </a>\r
                     <a rel="nofollow" id="comment-%ID%-convert" href="%CONVERT_URL%" title="{% trans "Convert comment to answer" %}"\r
-                        class="ajax-command comment-convert confirm" rel="nofollow">{% trans "Convert comment to answer" %}</a>\r
+                        class="ajax-command comment-convert confirm" rel="nofollow"> </a>\r
 \r
                     <span class="comment-age">({% trans "just now" %})</span>\r
                     <a class="comment-user" href="%PROFILE_URL%">%USERNAME%</a>\r