Resolve merge conflicts in 'settings.scss'

app/assets/stylesheets/pages/settings.scss

@@ -290,22 +290,12 @@
   }
 }
 
-<<<<<<< HEAD
 .saml-settings.info-well {
   .form-control[readonly] {
     background: $white-light;
   }
 }
 
-.modal-doorkeepr-auth,
-.doorkeeper-app-form {
-  .scope-description {
-    color: $theme-gray-700;
-  }
-}
-
-=======
->>>>>>> upstream/master
 .modal-doorkeepr-auth {
   .modal-body {
     padding: $gl-padding;