From 77e2000cb3ba111fd9d47592d549f4437c983381 Mon Sep 17 00:00:00 2001
From: joshua stein <jcs@jcs.org>
Date: Wed, 18 Nov 2015 11:35:34 -0600
Subject: [PATCH] comment: put merge icon before avatar

---
 app/views/comments/_comment.html.erb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/views/comments/_comment.html.erb b/app/views/comments/_comment.html.erb
index 00b639f..f237aea 100644
--- a/app/views/comments/_comment.html.erb
+++ b/app/views/comments/_comment.html.erb
@@ -31,15 +31,15 @@ class="comment <%= comment.current_vote ? (comment.current_vote[:vote] == 1 ?
       <label for="comment_folder_<%= comment.short_id %>"
         class="comment_folder"></label>
 
+      <% if defined?(was_merged) && was_merged %>
+        <span class="merge"></span>
+      <% end %>
+
       <% if @user && @user.show_avatars? %>
         <a href="/u/<%= comment.user.username %>"><img
           src="<%= comment.user.avatar_url(16) %>" class="avatar"></a>
       <% end %>
 
-      <% if defined?(was_merged) && was_merged %>
-        <span class="merge"></span>
-      <% end %>
-
       <a href="/u/<%= comment.user.username %>"
         class="<%= comment.html_class_for_user %>"><%=
         comment.user.username %></a>