From bc397562057106fbd3dee3bd78437e788ce6f088 Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Sat, 7 Jul 2018 14:01:20 -0700
Subject: [PATCH] Resolve conflicts in
 spec/lib/gitlab/import_export/all_models.yml

---
 spec/lib/gitlab/import_export/all_models.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/spec/lib/gitlab/import_export/all_models.yml b/spec/lib/gitlab/import_export/all_models.yml
index 1002fa2cb07b..2ba1377ebdb8 100644
--- a/spec/lib/gitlab/import_export/all_models.yml
+++ b/spec/lib/gitlab/import_export/all_models.yml
@@ -331,10 +331,7 @@ project:
 - settings
 - ci_cd_settings
 - import_export_upload
-<<<<<<< HEAD
 - vulnerability_feedback
-=======
->>>>>>> upstream/master
 award_emoji:
 - awardable
 - user
-- 
GitLab