Resolve conflict in projects.scss

app/assets/stylesheets/pages/projects.scss

@@ -808,14 +808,11 @@ pre.light-well {
   }
 }
 
-<<<<<<< HEAD
 a.allowed-to-merge,
 a.allowed-to-push {
   cursor: pointer;
 }
 
-=======
->>>>>>> ce-com/master
 .new-protected-branch,
 .new-protected-tag {
   @include new-style-dropdown;