Fix PopulateImportState spec conflicts

7974fd5e · Tiago Botelho · 45112eef · 7974fd5e
Commit 7974fd5e authored May 07, 2018 by Tiago Botelho
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

spec/lib/gitlab/background_migration/populate_import_state_spec.rb ...gitlab/background_migration/populate_import_state_spec.rb +0 -4

No files found.
--- a/spec/lib/gitlab/background_migration/populate_import_state_spec.rb
+++ b/spec/lib/gitlab/background_migration/populate_import_state_spec.rb
 require 'spec_helper'

-<<<<<<< HEAD
 describe Gitlab::BackgroundMigration::PopulateImportState, :migration, schema: 20180430144643 do
-=======
-describe Gitlab::BackgroundMigration::PopulateImportState, :migration, schema: 20180502134117 do
->>>>>>> upstream/master
  let(:migration) { described_class.new }
  let(:namespaces) { table(:namespaces) }
  let(:projects) { table(:projects) }