Resolve conflict in app/assets/javascripts/boards/components/board_card.vue

Signed-off-by: Rémy Coutable <remy@rymai.me>

app/assets/javascripts/boards/components/board_card.vue

@@ -66,10 +66,7 @@ export default {
       :list="list"
       :issue="issue"
       :issue-link-base="issueLinkBase"
-<<<<<<< HEAD:app/assets/javascripts/boards/components/board_card.vue
       :group-id="groupId"
-=======
->>>>>>> upstream/master:app/assets/javascripts/boards/components/board_card.vue
       :root-path="rootPath"
       :update-filters="true" />
   </li>