Resolve conflict in app/assets/stylesheets/pages/boards.scss

app/assets/stylesheets/pages/boards.scss

@@ -458,7 +458,6 @@
   margin: 5px;
 }
 
-<<<<<<< HEAD
 .boards-title-holder {
   padding: 25px 13px $gl-padding;
 
@@ -483,8 +482,6 @@
   border-top: 1px solid $border-color;
 }
 
-=======
->>>>>>> upstream/master
 .page-with-contextual-sidebar.layout-page .issue-boards-sidebar {
   .issuable-sidebar-header {
     position: relative;