Fix conflict for app/assets/javascripts/boards/components/board_card.vue

ca43749a · Filipa Lacerda · 9389482d · ca43749a
Commit ca43749a authored Jan 11, 2018 by Filipa Lacerda
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

app/assets/javascripts/boards/components/board_card.vue app/assets/javascripts/boards/components/board_card.vue +0 -3

No files found.
--- a/app/assets/javascripts/boards/components/board_card.vue
+++ b/app/assets/javascripts/boards/components/board_card.vue
@@ -35,12 +35,9 @@ export default {
      type: String,
      default: '',
    },
-<<<<<<< HEAD
    groupId: {
      type: Number,
    },
-=======
->>>>>>> upstream/master
  },
  data() {
    return {