Resolve app/assets/javascripts/boards/mixins/sortable_default_options.js

1bf0261c · Lin Jen-Shin · 02310016 · 1bf0261c
Commit 1bf0261c authored Mar 12, 2018 by Lin Jen-Shin
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

app/assets/javascripts/boards/mixins/sortable_default_options.js ...ets/javascripts/boards/mixins/sortable_default_options.js +0 -4

No files found.
--- a/app/assets/javascripts/boards/mixins/sortable_default_options.js
+++ b/app/assets/javascripts/boards/mixins/sortable_default_options.js
@@ -2,11 +2,7 @@
 /* global DocumentTouch */

 import $ from 'jquery';
-<<<<<<< HEAD
 import sortableConfig from 'ee/sortable/sortable_config';
-=======
-import sortableConfig from '../../sortable/sortable_config';
->>>>>>> upstream/master

 window.gl = window.gl || {};
 window.gl.issueBoards = window.gl.issueBoards || {};