Fix syntax error in app/assets/stylesheets/pages/boards.scss

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Fix syntax error in app/assets/stylesheets/pages/boards.scss
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
ff6eb578 · Dmitriy Zaporozhets · f78d27be · ff6eb578
Commit ff6eb578 authored Oct 10, 2017 by Dmitriy Zaporozhets
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

app/assets/stylesheets/pages/boards.scss app/assets/stylesheets/pages/boards.scss +0 -1

No files found.
--- a/app/assets/stylesheets/pages/boards.scss
+++ b/app/assets/stylesheets/pages/boards.scss
@@ -456,7 +456,6 @@
  margin: 5px;
 }
-<<<<<<< HEAD
 .boards-title-holder {
  padding: 25px 13px $gl-padding;