fix conflicts in app/assets/stylesheets/new_sidebar.scss

4d87700b · Mike Greiling · cd3e8819 · 4d87700b
Commit 4d87700b authored Jul 07, 2017 by Mike Greiling
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

app/assets/stylesheets/new_sidebar.scss app/assets/stylesheets/new_sidebar.scss +0 -3

No files found.
--- a/app/assets/stylesheets/new_sidebar.scss
+++ b/app/assets/stylesheets/new_sidebar.scss
@@ -53,15 +53,12 @@ $new-sidebar-width: 220px;
        color: $hover-color;
      }
    }
-<<<<<<< HEAD
-=======
  }

  .project-title,
  .group-title {
    overflow: hidden;
    text-overflow: ellipsis;
->>>>>>> master-ce
  }
 }