diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-17 14:59:07 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-17 14:59:07 +0300 |
commit | 8b573c94895dc0ac0e1d9d59cf3e8745e8b539ca (patch) | |
tree | 544930fb309b30317ae9797a9683768705d664c4 /app/assets/stylesheets/page_bundles/merge_conflicts.scss | |
parent | 4b1de649d0168371549608993deac953eb692019 (diff) |
Add latest changes from gitlab-org/gitlab@13-7-stable-eev13.7.0-rc42
Diffstat (limited to 'app/assets/stylesheets/page_bundles/merge_conflicts.scss')
-rw-r--r-- | app/assets/stylesheets/page_bundles/merge_conflicts.scss | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/app/assets/stylesheets/page_bundles/merge_conflicts.scss b/app/assets/stylesheets/page_bundles/merge_conflicts.scss index b0655408edf..a26affb10a9 100644 --- a/app/assets/stylesheets/page_bundles/merge_conflicts.scss +++ b/app/assets/stylesheets/page_bundles/merge_conflicts.scss @@ -255,10 +255,6 @@ $colors: ( } } - .btn-success .fa-spinner { - color: var(--white, $white); - } - .editor-wrap { &.is-loading { .editor { |