Commit 953b4b78 authored by Nick Thomas's avatar Nick Thomas

Fix conflicts in JS specs

parent d0c4ee4a
import '~/gl_dropdown'; import '~/gl_dropdown';
<<<<<<< HEAD
import '~/lib/utils/type_utility';
=======
>>>>>>> ce/master
import '~/blob/create_branch_dropdown'; import '~/blob/create_branch_dropdown';
import '~/blob/target_branch_dropdown'; import '~/blob/target_branch_dropdown';
......
import '~/gl_dropdown'; import '~/gl_dropdown';
<<<<<<< HEAD
import '~/lib/utils/type_utility';
=======
>>>>>>> ce/master
import '~/blob/create_branch_dropdown'; import '~/blob/create_branch_dropdown';
import '~/blob/target_branch_dropdown'; import '~/blob/target_branch_dropdown';
......
/* eslint no-param-reassign: "off" */ /* eslint no-param-reassign: "off" */
import GfmAutoComplete from '~/gfm_auto_complete'; import GfmAutoComplete from '~/gfm_auto_complete';
<<<<<<< HEAD
=======
>>>>>>> ce/master
import 'vendor/jquery.caret'; import 'vendor/jquery.caret';
import 'vendor/jquery.atwho'; import 'vendor/jquery.atwho';
......
...@@ -2,10 +2,6 @@ ...@@ -2,10 +2,6 @@
import '~/gl_dropdown'; import '~/gl_dropdown';
import '~/lib/utils/common_utils'; import '~/lib/utils/common_utils';
<<<<<<< HEAD
import '~/lib/utils/type_utility';
=======
>>>>>>> ce/master
import '~/lib/utils/url_utility'; import '~/lib/utils/url_utility';
(() => { (() => {
......
...@@ -2,10 +2,6 @@ ...@@ -2,10 +2,6 @@
/* global IssuableContext */ /* global IssuableContext */
/* global LabelsSelect */ /* global LabelsSelect */
<<<<<<< HEAD
import '~/lib/utils/type_utility';
=======
>>>>>>> ce/master
import '~/gl_dropdown'; import '~/gl_dropdown';
import 'select2'; import 'select2';
import 'vendor/jquery.nicescroll'; import 'vendor/jquery.nicescroll';
......
...@@ -2,10 +2,6 @@ ...@@ -2,10 +2,6 @@
/* global Project */ /* global Project */
import 'select2/select2'; import 'select2/select2';
<<<<<<< HEAD
import '~/lib/utils/type_utility';
=======
>>>>>>> ce/master
import '~/gl_dropdown'; import '~/gl_dropdown';
import '~/api'; import '~/api';
import '~/project_select'; import '~/project_select';
......
...@@ -3,10 +3,6 @@ ...@@ -3,10 +3,6 @@
import '~/gl_dropdown'; import '~/gl_dropdown';
import '~/search_autocomplete'; import '~/search_autocomplete';
import '~/lib/utils/common_utils'; import '~/lib/utils/common_utils';
<<<<<<< HEAD
import '~/lib/utils/type_utility';
=======
>>>>>>> ce/master
import 'vendor/fuzzaldrin-plus'; import 'vendor/fuzzaldrin-plus';
(function() { (function() {
......
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