Skip to content

G
gitlab-ce
Commit a92d58b2 authored by Rémy Coutable's avatar Rémy Coutable
Browse files
Options

Resolve conflict in app/assets/javascripts/boards/stores/boards_store.js 

Signed-off-by: default avatarRémy Coutable <remy@rymai.me>
parent 24eaba35
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
app/assets/javascripts/boards/stores/boards_store.js
View file @ a92d58b2
...@@ -33,7 +33,6 @@ gl.issueBoards.BoardsStore = { ...@@ -33,7 +33,6 @@ gl.issueBoards.BoardsStore = {
this.detail = { this.detail = {
issue: {}, issue: {},
}; };
<<<<<<< HEAD
}, },
createNewListDropdownData() { createNewListDropdownData() {
this.state.currentBoard = { this.state.currentBoard = {
...@@ -45,8 +44,6 @@ gl.issueBoards.BoardsStore = { ...@@ -45,8 +44,6 @@ gl.issueBoards.BoardsStore = {
showPage(page) { showPage(page) {
this.state.reload = false; this.state.reload = false;
this.state.currentPage = page; this.state.currentPage = page;
=======
>>>>>>> upstream/master
}, },
addList (listObj, defaultAvatar) { addList (listObj, defaultAvatar) {
const list = new List(listObj, defaultAvatar); const list = new List(listObj, defaultAvatar);
......
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