Resolve conflict in merge_requests.scss

a4b45066 · winh · c9193e7e · a4b45066
Commit a4b45066 authored Sep 05, 2017 by winh
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

app/assets/stylesheets/pages/merge_requests.scss app/assets/stylesheets/pages/merge_requests.scss +0 -3

No files found.
--- a/app/assets/stylesheets/pages/merge_requests.scss
+++ b/app/assets/stylesheets/pages/merge_requests.scss
@@ -756,7 +756,6 @@
  }
 }
-<<<<<<< HEAD
 .mr-widget-icon {
  font-size: 22px;
  margin: 0 10px 0 0;
@@ -789,8 +788,6 @@
  }
 }
-=======
->>>>>>> ce-com/master
 .merge-request-form {
  @include new-style-dropdown;
 }