diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2016-07-29 12:15:10 +0300 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2016-08-12 23:24:43 +0300 |
| commit | 10321bf862135b946d50918e89bc4667e8d9071d (patch) | |
| tree | 51c3f189625ddf21f75a51a6ded10337b6f3cf99 /app/assets/stylesheets/pages/merge_conflicts.scss | |
| parent | 14a4b17d1c8a43c77b0459fd543be36838031610 (diff) | |
| download | gitlab-ce-10321bf862135b946d50918e89bc4667e8d9071d.tar.gz | |
Fixes for merge conflicts UI.
Diffstat (limited to 'app/assets/stylesheets/pages/merge_conflicts.scss')
| -rw-r--r-- | app/assets/stylesheets/pages/merge_conflicts.scss | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/assets/stylesheets/pages/merge_conflicts.scss b/app/assets/stylesheets/pages/merge_conflicts.scss index f55134f968c..0e306c26541 100644 --- a/app/assets/stylesheets/pages/merge_conflicts.scss +++ b/app/assets/stylesheets/pages/merge_conflicts.scss @@ -16,6 +16,7 @@ $unselected_line: #F8F8F8; .diff-wrap-lines .line_content { white-space: normal; + min-height: 19px; } .head { |