resolve conflict in `app/assets/javascripts/boards/components/sidebar/remove_issue.vue`

b9340dfd · Lukas Eipert · 13af95c7 · b9340dfd
Commit b9340dfd authored Jun 27, 2018 by Lukas Eipert
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

app/assets/javascripts/boards/components/sidebar/remove_issue.vue ...ts/javascripts/boards/components/sidebar/remove_issue.vue +0 -3

No files found.
--- a/app/assets/javascripts/boards/components/sidebar/remove_issue.vue
+++ b/app/assets/javascripts/boards/components/sidebar/remove_issue.vue
@@ -23,10 +23,7 @@
    },
    methods: {
      removeIssue() {
-<<<<<<< HEAD
        const board = Store.state.currentBoard;
-=======
->>>>>>> upstream/master
        const { issue } = this;
        const lists = issue.getLists();
        const boardLabelIds = board.labels.map(label => label.id);