Remove unnecessary styling came from merge conflicts.

509f0b1a · Fatih Acet · 183a52f8 · 509f0b1a
Commit 509f0b1a authored Dec 28, 2016 by Fatih Acet
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 8 deletions

app/assets/stylesheets/pages/notes.scss app/assets/stylesheets/pages/notes.scss +0 -8

No files found.
--- 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;
-}