Download as
Browse Code »

Commit d1da45e1a369c924e26a75e821e9ba8b482e29ef

Authored by Izaak Alpert
1 parent c1b05e7b
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Rebasing on master 

Change-Id: Iad49f225f23675b843457df5d6965c7cd50e99a3
Showing 1 changed file with 1 additions and 2 deletions   Show diff stats
app/views/admin/users/show.html.haml
  Diff comments   View file @d1da45e
@@ -20,12 +20,11 @@ @@ -20,12 +20,11 @@
20 20
21 .row 21 .row
22 .span6 22 .span6
23 -<<<<<<< HEAD  
24 .ui-box 23 .ui-box
25 %h5.title 24 %h5.title
26 Account: 25 Account:
27 .pull-right 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 %ul.well-list 28 %ul.well-list
30 %li 29 %li
31 %span.light Name: 30 %span.light Name: