diff options
Diffstat (limited to 'app/assets/stylesheets/pages/merge_conflicts.scss')
| -rw-r--r-- | app/assets/stylesheets/pages/merge_conflicts.scss | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/assets/stylesheets/pages/merge_conflicts.scss b/app/assets/stylesheets/pages/merge_conflicts.scss index ea848b2c2c0..c851bd52b1a 100644 --- a/app/assets/stylesheets/pages/merge_conflicts.scss +++ b/app/assets/stylesheets/pages/merge_conflicts.scss @@ -278,4 +278,8 @@ $colors: ( margin-left: 10px; } } + + .resolve-conflicts-form { + padding-top: $gl-padding; + } } |