From 3eb76b5566dec2d1c6cba3426bfceac91e39e34d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= <xavier.julian@kaleidos.net>
Date: Thu, 23 Oct 2014 13:21:13 +0200
Subject: [PATCH] =?UTF-8?q?Rrebohluci=C3=B3nt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/styles/modules/admin/admin-roles.scss | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/app/styles/modules/admin/admin-roles.scss b/app/styles/modules/admin/admin-roles.scss
index 0a713da8..fb5b000f 100644
--- a/app/styles/modules/admin/admin-roles.scss
+++ b/app/styles/modules/admin/admin-roles.scss
@@ -27,24 +27,12 @@
     }
     .edit-role {
         @include table-flex(stretch, left, center, row, wrap);
-<<<<<<< HEAD
-<<<<<<< HEAD
-        margin-bottom: 1rem;
-        input {
-=======
-=======
->>>>>>> Admin roles design and UX
         background-color: $whitish;
         margin-bottom: 1rem;
         padding: .5rem;
         input {
             background-color: $white;
-<<<<<<< HEAD
->>>>>>> fix #1397 - rename role
-            width: auto;
-=======
             width: 50%;
->>>>>>> Admin roles design and UX
         }
         .icon-floppy {
             @include transition(color.3s linear);