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

64fe1a3c · Stan Hu · 4b4ed315 · 64fe1a3c
Commit 64fe1a3c authored Apr 09, 2018 by Stan Hu
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

app/assets/javascripts/boards/components/board.js app/assets/javascripts/boards/components/board.js +0 -3

No files found.
--- a/app/assets/javascripts/boards/components/board.js
+++ b/app/assets/javascripts/boards/components/board.js
@@ -20,10 +20,7 @@ gl.issueBoards.Board = Vue.extend({
    boardList,
    'board-delete': gl.issueBoards.BoardDelete,
    BoardBlankState,
-<<<<<<< HEAD
    boardPromotionState,
-=======
->>>>>>> upstream/master
  },
  props: {
    list: Object,