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

5d774c8b · Stan Hu · ea936b2f · 5d774c8b
Commit 5d774c8b authored Jun 25, 2018 by Stan Hu
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,
    Subscriptions,
-<<<<<<< HEAD
    Weight,
-=======
->>>>>>> upstream/master
  },
  props: {
    currentUser: {