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

f6f1eb40 · Winnie Hellmann · c6d8cfa7 · f6f1eb40
Commit f6f1eb40 authored Nov 06, 2017 by Winnie Hellmann
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 7 deletions

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

No files found.
--- a/app/assets/stylesheets/pages/merge_requests.scss
+++ b/app/assets/stylesheets/pages/merge_requests.scss
@@ -364,13 +364,6 @@
  }
 }
-<<<<<<< HEAD
-.mr-widget-body-controls {
-  flex-wrap: wrap;
-}
-=======
->>>>>>> ce-com/master
 .mr-widget-body-controls {
  flex-wrap: wrap;
 }