Skip to content

G
gitlab-ce
Commit 64fe1a3c authored by Stan Hu's avatar Stan Hu
Browse files
Options

Resolve conflicts in app/assets/javascripts/boards/components/board.js

parent 4b4ed315
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
app/assets/javascripts/boards/components/board.js
View file @ 64fe1a3c
...@@ -20,10 +20,7 @@ gl.issueBoards.Board = Vue.extend({ ...@@ -20,10 +20,7 @@ gl.issueBoards.Board = Vue.extend({
boardList, boardList,
'board-delete': gl.issueBoards.BoardDelete, 'board-delete': gl.issueBoards.BoardDelete,
BoardBlankState, BoardBlankState,
<<<<<<< HEAD
boardPromotionState, boardPromotionState,
=======
>>>>>>> upstream/master
}, },
props: { props: {
list: Object, list: Object,
......
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