From ba6e73d75b4fedd780cdcdc6e04c27666996958e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= <xavier.julian@kaleidos.net>
Date: Wed, 23 Jul 2014 10:58:09 +0200
Subject: [PATCH] Bad merge fix

---
 app/styles/modules/common/colors-table.scss | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/app/styles/modules/common/colors-table.scss b/app/styles/modules/common/colors-table.scss
index 420b10a1..c9790527 100644
--- a/app/styles/modules/common/colors-table.scss
+++ b/app/styles/modules/common/colors-table.scss
@@ -23,10 +23,6 @@
         &.new-status {
             padding-left: 50px;
         }
-        &.edition {
-            padding-left: 50px;
-        }
-
         &.hidden {
             display: none;
         }