Fix ce-to-ee merge conflicts for migration.

db/post_migrate/20180723130817_delete_inconsistent_internal_id_records.rb

@@ -20,10 +20,7 @@ class DeleteInconsistentInternalIdRecords < ActiveRecord::Migration
       delete_internal_id_records('milestones', 'project_id')
       delete_internal_id_records('milestones', 'namespace_id', 'group_id')
       delete_internal_id_records('ci_pipelines', 'project_id')
-<<<<<<< HEAD
       delete_internal_id_records('epics', 'namespace_id', 'group_id')
-=======
->>>>>>> upstream/master
     end
   end
 

spec/migrations/delete_inconsistent_internal_id_records_spec.rb

@@ -120,7 +120,6 @@ describe DeleteInconsistentInternalIdRecords, :migration do
       expect { migrate! }.not_to change { internal_id_query.call(group3).size }
     end
   end
-<<<<<<< HEAD
 
   context 'for milestones (by group)' do
     # epics (by group) is a little different than most of the other models
@@ -160,6 +159,4 @@ describe DeleteInconsistentInternalIdRecords, :migration do
       expect { migrate! }.not_to change { internal_id_query.call(group3).size }
     end
   end
-=======
->>>>>>> upstream/master
 end