Skip to content

G
gitlab-ce
Commit 0b90d23d authored by Winnie Hellmann's avatar Winnie Hellmann
Browse files
Options

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

parent bc827859
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
app/assets/stylesheets/pages/boards.scss
View file @ 0b90d23d
...@@ -458,7 +458,6 @@ ...@@ -458,7 +458,6 @@
margin: 5px; margin: 5px;
} }
<<<<<<< HEAD
.boards-title-holder { .boards-title-holder {
padding: 25px 13px $gl-padding; padding: 25px 13px $gl-padding;
...@@ -483,8 +482,6 @@ ...@@ -483,8 +482,6 @@
border-top: 1px solid $border-color; border-top: 1px solid $border-color;
} }
=======
>>>>>>> upstream/master
.page-with-contextual-sidebar.layout-page .issue-boards-sidebar { .page-with-contextual-sidebar.layout-page .issue-boards-sidebar {
.issuable-sidebar-header { .issuable-sidebar-header {
position: relative; position: relative;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7