Skip to content

G
gitlab-ce
Commit a0c170ef authored by Stan Hu's avatar Stan Hu
Browse files
Options

Resolve conflict in app/assets/javascripts/boards/index.js

parent a1c740a0
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 2 deletions
app/assets/javascripts/boards/index.js
View file @ a0c170ef
...@@ -368,6 +368,4 @@ export default () => { ...@@ -368,6 +368,4 @@ export default () => {
'boards-selector': gl.issueBoards.BoardsSelector, 'boards-selector': gl.issueBoards.BoardsSelector,
} }
}); });
=======
>>>>>>> upstream/master:app/assets/javascripts/boards/index.js
}; };
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