Resolve app/assets/stylesheets/pages/milestone.scss

e5c9162a · Robert Speicher · 291def85 · e5c9162a
Commit e5c9162a authored Apr 16, 2018 by Robert Speicher
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 7 deletions

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

No files found.
--- a/app/assets/stylesheets/pages/milestone.scss
+++ b/app/assets/stylesheets/pages/milestone.scss
@@ -195,10 +195,6 @@
  background-color: $white-light;
 }

-<<<<<<< HEAD
-
-=======
->>>>>>> upstream/master
 .milestone-deprecation-message {
  .popover {
    padding: 0;
@@ -233,7 +229,6 @@
    display: inline;
  }
 }
-<<<<<<< HEAD

 // EE-only

@@ -393,5 +388,3 @@
    }
  }
 }
-=======
->>>>>>> upstream/master