From 509f0b1ac41254d010a1b94d05dbf0d2a75221d3 Mon Sep 17 00:00:00 2001
From: Fatih Acet <acetfatih@gmail.com>
Date: Wed, 28 Dec 2016 21:28:20 +0300
Subject: Remove unnecessary styling came from merge conflicts.

---
 app/assets/stylesheets/pages/notes.scss | 8 --------
 1 file changed, 8 deletions(-)

(limited to 'app/assets')

diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss
index 3d111f6bfcb..10a9df18c47 100644
--- a/app/assets/stylesheets/pages/notes.scss
+++ b/app/assets/stylesheets/pages/notes.scss
@@ -585,11 +585,3 @@ ul.notes {
     }
   }
 }
-
-.note-edit-warning.settings-message {
-  display: none;
-  position: relative;
-  top: 1px;
-  left: 7px;
-  padding: 5px 10px;
-}
-- 
cgit v1.2.1