Fix conflicts for app/assets/javascripts/boards/components/board_sidebar.js

fab47065 · Filipa Lacerda · 26ffa151 · fab47065
Commit fab47065 authored Jun 14, 2018 by Filipa Lacerda
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

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

No files found.
--- a/app/assets/javascripts/boards/components/board_sidebar.js
+++ b/app/assets/javascripts/boards/components/board_sidebar.js
@@ -27,10 +27,7 @@ gl.issueBoards.BoardSidebar = Vue.extend({
    assignees,
    removeBtn: gl.issueBoards.RemoveIssueBtn,
    subscriptions,
-<<<<<<< HEAD
    weight,
-=======
->>>>>>> upstream/master
  },
  props: {
    currentUser: {