From 60a4fe8e881bfd3159bd0d9f795e9ddf1b61ca48 Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Wed, 22 Nov 2017 19:02:33 +0000
Subject: [PATCH] Fix conflicts for
 app/assets/javascripts/init_legacy_filters.js

---
 app/assets/javascripts/init_legacy_filters.js | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/app/assets/javascripts/init_legacy_filters.js b/app/assets/javascripts/init_legacy_filters.js
index 871ecdb5aa6..150cd98dbb5 100644
--- a/app/assets/javascripts/init_legacy_filters.js
+++ b/app/assets/javascripts/init_legacy_filters.js
@@ -1,10 +1,7 @@
 /* eslint-disable no-new */
 import LabelsSelect from './labels_select';
 /* global MilestoneSelect */
-<<<<<<< HEAD
 /* global WeightSelect */
-=======
->>>>>>> upstream/master
 import subscriptionSelect from './subscription_select';
 import UsersSelect from './users_select';
 import issueStatusSelect from './issue_status_select';
@@ -15,8 +12,5 @@ export default () => {
   new MilestoneSelect();
   issueStatusSelect();
   subscriptionSelect();
-<<<<<<< HEAD
   new WeightSelect();
-=======
->>>>>>> upstream/master
 };
-- 
2.30.9