Resolve conflict in PR #3372

This commit is contained in:
Frederic Guillot 2017-11-15 15:10:54 -08:00
parent 765cb42725
commit 7d678780c1
2 changed files with 4 additions and 1 deletions

File diff suppressed because one or more lines are too long

View File

@ -87,6 +87,9 @@ a.board-swimlane-toggle
.board-task-list
min-height: 60px
.board-task-list .task-board:last-child
margin-bottom: 0
.board-task-list-limit
background-color: $board-task-limit-color