Skip to content

G
gitlab-ce
Commit fab47065 authored by Filipa Lacerda's avatar Filipa Lacerda
Browse files
Options

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

parent 26ffa151
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
app/assets/javascripts/boards/components/board_sidebar.js
View file @ fab47065
...@@ -27,10 +27,7 @@ gl.issueBoards.BoardSidebar = Vue.extend({ ...@@ -27,10 +27,7 @@ gl.issueBoards.BoardSidebar = Vue.extend({
assignees, assignees,
removeBtn: gl.issueBoards.RemoveIssueBtn, removeBtn: gl.issueBoards.RemoveIssueBtn,
subscriptions, subscriptions,
<<<<<<< HEAD
weight, weight,
=======
>>>>>>> upstream/master
}, },
props: { props: {
currentUser: { currentUser: {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7