Fix MigrateImportAttributesDataFromProjectsToProjectMirrorData spec conflicts

c37b0461 · Tiago Botelho · 95abb9a6 · c37b0461
Commit c37b0461 authored May 07, 2018 by Tiago Botelho
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

spec/migrations/migrate_import_attributes_data_from_projects_to_project_mirror_data_spec.rb ...ributes_data_from_projects_to_project_mirror_data_spec.rb +0 -4

No files found.
--- a/spec/migrations/migrate_import_attributes_data_from_projects_to_project_mirror_data_spec.rb
+++ b/spec/migrations/migrate_import_attributes_data_from_projects_to_project_mirror_data_spec.rb
 require 'spec_helper'
-<<<<<<< HEAD
 require Rails.root.join('db', 'post_migrate', '20180430144643_migrate_import_attributes_data_from_projects_to_project_mirror_data.rb')
-=======
-require Rails.root.join('db', 'post_migrate', '20180502134117_migrate_import_attributes_data_from_projects_to_project_mirror_data.rb')
->>>>>>> upstream/master

 describe MigrateImportAttributesDataFromProjectsToProjectMirrorData, :sidekiq, :migration do
  let(:namespaces) { table(:namespaces) }