Resolve conflicts in app/assets/stylesheets/pages/merge_requests.scss

Based on 7d96866eddd7602be19effcce11a3568ed54666d.
Signed-off-by: Rémy Coutable <remy@rymai.me>

app/assets/stylesheets/pages/merge_requests.scss

@@ -3,12 +3,6 @@
  *
  */
 
-<<<<<<< HEAD
-$status-icon-size: 22px;
-$status-icon-margin: $gl-btn-padding;
-
-=======
->>>>>>> upstream/master
 .space-children {
   @include clearfix;
 
@@ -30,11 +24,7 @@ $status-icon-margin: $gl-btn-padding;
   .mr-widget-heading,
   .mr-widget-section,
   .mr-widget-footer {
-<<<<<<< HEAD
-    padding: 16px;
-=======
     padding: $gl-padding;
->>>>>>> upstream/master
     border-top: solid 1px $border-color;
   }
 
@@ -55,11 +45,7 @@ $status-icon-margin: $gl-btn-padding;
   }
 
   .btn {
-<<<<<<< HEAD
-    font-size: 14px;
-=======
     font-size: $gl-font-size;
->>>>>>> upstream/master
 
     &[disabled] {
       opacity: 0.3;
@@ -72,11 +58,6 @@ $status-icon-margin: $gl-btn-padding;
     }
 
     &.dropdown-toggle {
-<<<<<<< HEAD
-      padding: 4px 10px;
-
-=======
->>>>>>> upstream/master
       .fa {
         color: inherit;
       }
@@ -726,96 +707,9 @@ $status-icon-margin: $gl-btn-padding;
   }
 }
 
-<<<<<<< HEAD
-#merge-request-widget-app .loading {
-  padding-top: 5px;
-  border-top: 1px solid $well-inner-border;
-}
-
-.approvals-footer {
-  display: flex;
-
-  .approvers-prefix,
-  .approvers-list {
-    display: flex;
-    align-items: center;
-    margin-right: 5px;
-  }
-
-  .unapprove-btn {
-    border: none;
-    background: transparent;
-    cursor: pointer;
-
-    &:hover {
-      color: $gl-text-color-secondary;
-      text-decoration: none;
-    }
-
-    &:focus {
-      outline: none;
-    }
-  }
-
-  .approver-avatar {
-    position: relative;
-  }
-}
-
-.link-to-member-avatar {
-  .disabled {
-    pointer-events: none;
-    cursor: default;
-  }
-
-  .avatar {
-    margin-bottom: 0;
-    margin-left: 7px;
-    display: block;
-  }
-}
-
-=======
->>>>>>> upstream/master
 .mr-memory-usage {
   p.usage-info-loading .usage-info-load-spinner {
     margin-right: 10px;
     font-size: 16px;
   }
-<<<<<<< HEAD
-}
-
-
-.mr-widget-icon {
-  font-size: 22px;
-  margin: 0 10px 0 0;
-}
-
-.mr-widget-code-quality {
-  padding-top: $gl-padding-top;
-
-  .code-quality-container {
-    border-top: 1px solid $gray-darker;
-    border-bottom: 1px solid $gray-darker;
-    padding: $gl-padding-top;
-    background-color: $gray-light;
-    margin: 4px -16px 0;
-
-    .mr-widget-code-quality-list {
-      list-style: none;
-      padding: 4px 36px;
-      margin: 0;
-      line-height: $code_line_height;
-
-      li.success {
-        color: $green-500;
-      }
-
-      li.failed {
-        color: $red-500;
-      }
-    }
-  }
-=======
->>>>>>> upstream/master
 }