Skip to content

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

Fix conflicts for app/assets/javascripts/boards/index.js

parent 4144d68e
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
app/assets/javascripts/boards/index.js
View file @ f45b741a
...@@ -37,10 +37,7 @@ import tooltip from '~/vue_shared/directives/tooltip'; // eslint-disable-line im ...@@ -37,10 +37,7 @@ import tooltip from '~/vue_shared/directives/tooltip'; // eslint-disable-line im
export default () => { export default () => {
const $boardApp = document.getElementById('board-app'); const $boardApp = document.getElementById('board-app');
const Store = gl.issueBoards.BoardsStore; const Store = gl.issueBoards.BoardsStore;
<<<<<<< HEAD
const issueBoardsContent = document.querySelector('.content-wrapper > .js-focus-mode-board'); const issueBoardsContent = document.querySelector('.content-wrapper > .js-focus-mode-board');
=======
>>>>>>> upstream/master
window.gl = window.gl || {}; window.gl = window.gl || {};
......
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