Resolve conflicts in spec/factories/projects.rb

spec/factories/projects.rb

@@ -74,18 +74,14 @@ FactoryBot.define do
 
     trait :import_scheduled do
       import_status :scheduled
-<<<<<<< HEAD
 
       after(:create) do |project, _|
         project.import_state&.update_attributes(last_update_scheduled_at: Time.now)
       end
-=======
->>>>>>> upstream/master
     end
 
     trait :import_started do
       import_status :started
-<<<<<<< HEAD
 
       after(:create) do |project, _|
         project.import_state&.update_attributes(last_update_started_at: Time.now)
@@ -98,17 +94,10 @@ FactoryBot.define do
       import_status :finished
       mirror_last_update_at timestamp
       mirror_last_successful_update_at timestamp
-=======
-    end
-
-    trait :import_finished do
-      import_status :finished
->>>>>>> upstream/master
     end
 
     trait :import_failed do
       import_status :failed
-<<<<<<< HEAD
       mirror_last_update_at { Time.now }
     end
 
@@ -119,8 +108,6 @@ FactoryBot.define do
       after(:create) do |project|
         project.import_state&.update_attributes(retry_count: Gitlab::Mirror::MAX_RETRY + 1)
       end
-=======
->>>>>>> upstream/master
     end
 
     trait :disabled_mirror do
@@ -216,10 +203,7 @@ FactoryBot.define do
         url "http://foo.com"
         enabled true
       end
-<<<<<<< HEAD
 
-=======
->>>>>>> upstream/master
       after(:create) do |project, evaluator|
         project.remote_mirrors.create!(url: evaluator.url, enabled: evaluator.enabled)
       end