diff options
Diffstat (limited to 'templates/user_stats.html')
| -rw-r--r-- | templates/user_stats.html | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/templates/user_stats.html b/templates/user_stats.html index b72f5750..ecc39807 100644 --- a/templates/user_stats.html +++ b/templates/user_stats.html @@ -97,14 +97,9 @@ <td width="180" valign="top"> {% for tag in user_tags%} <a rel="tag" -<<<<<<< HEAD:templates/user_stats.html - title="{% blocktrans %}see other questions tagged '{{ tag }}' {% endblocktrans %}" - href="{% url forum.views.tag tag|urlencode %}">{{tag.name}}</a><span class="tag-number"> × {{ tag.used_count|intcomma }}</span><br/> -======= title="{% blocktrans with tag.name as tag_name %}see other questions with {{view_user}}'s contributions tagged '{{ tag_name }}' {% endblocktrans %}" href="{% url forum.views.tag tag|urlencode %}?user={{view_user.username}}">{{tag.name}}</a> <span class="tag-number">× {{ tag.user_tag_usage_count|intcomma }}</span><br/> ->>>>>>> 82d35490db90878f013523c4d1a5ec3af2df8b23:templates/user_stats.html {% if forloop.counter|divisibleby:"10" %} </td> <td width="180" valign="top"> |