Resolve conflict in app/assets/stylesheets/framework/dropdowns.scss

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

Resolve conflict in app/assets/stylesheets/framework/dropdowns.scss
Signed-off-by: Rémy Coutable <remy@rymai.me>
5a8e8382 · Rémy Coutable · f8e93cbb · 5a8e8382
Commit 5a8e8382 authored Dec 06, 2017 by Rémy Coutable
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

app/assets/stylesheets/framework/dropdowns.scss app/assets/stylesheets/framework/dropdowns.scss +0 -3

No files found.
--- a/app/assets/stylesheets/framework/dropdowns.scss
+++ b/app/assets/stylesheets/framework/dropdowns.scss
@@ -1031,7 +1031,6 @@ header.header-content .dropdown-menu.projects-dropdown-menu {
  }
 }

-<<<<<<< HEAD
 .new-epic-dropdown {
  .dropdown-menu {
    padding-left: $gl-padding-top;
@@ -1061,8 +1060,6 @@ header.header-content .dropdown-menu.projects-dropdown-menu {
  }
 }

-=======
->>>>>>> upstream/master
 .dropdown-content-faded-mask {
  position: relative;