Fix ce-to-ee merge conflicts for migration.

6a1a6d2d · Andreas Brandl · 8c3df625 · 6a1a6d2d
Commit 6a1a6d2d authored Aug 20, 2018 by Andreas Brandl
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

spec/migrations/delete_inconsistent_internal_id_records_spec.rb ...igrations/delete_inconsistent_internal_id_records_spec.rb +0 -4

No files found.
--- a/spec/migrations/delete_inconsistent_internal_id_records_spec.rb
+++ b/spec/migrations/delete_inconsistent_internal_id_records_spec.rb
@@ -79,11 +79,7 @@ describe DeleteInconsistentInternalIdRecords, :migration do
  end
  context 'for milestones (by group)' do
-<<<<<<< HEAD
    # milestones (by group) is a little different than most of the other models
-=======
-    # milestones (by group) is a little different than all of the other models
->>>>>>> upstream/master
    let!(:group1) { create(:group) }
    let!(:group2) { create(:group) }
    let!(:group3) { create(:group) }