Skip to content

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

Resolve conflicts in app/assets/javascripts/boards/models/list.js

parent 7cce2c28
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
app/assets/javascripts/boards/models/list.js
View file @ 2d929fad
...@@ -6,10 +6,7 @@ import ListLabel from '~/vue_shared/models/label'; ...@@ -6,10 +6,7 @@ import ListLabel from '~/vue_shared/models/label';
import ListAssignee from '~/vue_shared/models/assignee'; import ListAssignee from '~/vue_shared/models/assignee';
import { urlParamsToObject } from '~/lib/utils/common_utils'; import { urlParamsToObject } from '~/lib/utils/common_utils';
import boardsStore from '../stores/boards_store'; import boardsStore from '../stores/boards_store';
<<<<<<< HEAD
import ListMilestone from './milestone'; import ListMilestone from './milestone';
=======
>>>>>>> upstream/master
const PER_PAGE = 20; const PER_PAGE = 20;
......
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