summaryrefslogtreecommitdiff
path: root/app/assets
diff options
context:
space:
mode:
authorFatih Acet <acetfatih@gmail.com>2016-12-28 21:28:20 +0300
committerFatih Acet <acetfatih@gmail.com>2017-01-04 23:37:54 +0300
commit509f0b1ac41254d010a1b94d05dbf0d2a75221d3 (patch)
treef3f436e89c4f02db07384021120dffb0f5359894 /app/assets
parent183a52f8e1454a0268993baca5b1a6793d9150f9 (diff)
downloadgitlab-ce-509f0b1ac41254d010a1b94d05dbf0d2a75221d3.tar.gz
Remove unnecessary styling came from merge conflicts.
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/stylesheets/pages/notes.scss8
1 files changed, 0 insertions, 8 deletions
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;
-}