Merge branch '262073-fix-merge-conflict-none-button-text' into 'master'

"None" style: fix merge conflict button text

See merge request gitlab-org/gitlab!44427

app/assets/stylesheets/page_bundles/merge_conflicts.scss

@@ -226,6 +226,14 @@ $colors: (
   .solarized-dark {
     @include color-scheme('solarized-dark'); }
 
+  .none {
+    .line_content.header {
+      button {
+        color: $gray-900;
+      }
+    }
+  }
+
   .diff-wrap-lines .line_content {
     white-space: normal;
     min-height: 19px;

changelogs/unreleased/262073-fix-merge-conflict-button-text-none.yml

+---
+title: Fix merge conflict button text if "None" code style selected
+merge_request: 44427
+author: David Barr @davebarr
+type: fixed