Rebasing on master

Change-Id: Iad49f225f23675b843457df5d6965c7cd50e99a3

Rebasing on master
Change-Id: Iad49f225f23675b843457df5d6965c7cd50e99a3
Izaak Alpert
1 parent c1b05e7b
Showing 1 changed file with 1 additions and 2 deletions Show diff stats
app/views/admin/users/show.html.haml
@@ -20,12 +20,11 @@
  
 .row
   .span6
-<<<<<<< HEAD
     .ui-box
       %h5.title
         Account:
         .pull-right
-          = image_tag gravatar_icon(@admin_user.email, 32), class: "avatar s32", alt: ''
+          = image_tag gravatar_icon(@admin_user.email, 32), class:"avatar s32", alt:""
       %ul.well-list
         %li
           %span.light Name:
...	...	@@ -20,12 +20,11 @@
20	20
21	21	.row
22	22	.span6
23		-<<<<<<< HEAD
24	23	.ui-box
25	24	%h5.title
26	25	Account:
27	26	.pull-right
28		- = image_tag gravatar_icon(@admin_user.email, 32), class: "avatar s32", alt: ''
	27	+ = image_tag gravatar_icon(@admin_user.email, 32), class:"avatar s32", alt:""
29	28	%ul.well-list
30	29	%li
31	30	%span.light Name:
...	...