diff options
| author | Eric Eastwood <contact@ericeastwood.com> | 2017-06-08 10:44:15 -0500 |
|---|---|---|
| committer | Eric Eastwood <contact@ericeastwood.com> | 2017-06-08 10:44:15 -0500 |
| commit | 0f3542c8fba27f60ffe5e7c0ab7d506206957723 (patch) | |
| tree | 931235a53a2e02239c25c2687c0342740aab2aac /app | |
| parent | 000f42176845409e5b5725bd701438e50d29ba63 (diff) | |
| download | gitlab-ce-0f3542c8fba27f60ffe5e7c0ab7d506206957723.tar.gz | |
Fix conflicts in notes.scssfix-9-2-stable-conflicts-for-mr-11702
See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11702
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/stylesheets/pages/notes.scss | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss index 49db0ef9961..d513ee7eb0a 100644 --- a/app/assets/stylesheets/pages/notes.scss +++ b/app/assets/stylesheets/pages/notes.scss @@ -394,19 +394,12 @@ ul.notes { padding-bottom: 8px; } -<<<<<<< HEAD -======= -.system-note .note-header-info { - padding-bottom: 0; -} - .note-header-author-name { @media (max-width: $screen-xs-max) { display: none; } } ->>>>>>> 4144144... Merge branch '32801-fix-discussion-header-wrapping-in-parallel-diff' into 'master' .note-headline-light { display: inline; |