Resolve conflicts in db/migrate/20180503131624_create_remote_mirrors.rb

db/migrate/20180503131624_create_remote_mirrors.rb

@@ -28,10 +28,6 @@ class CreateRemoteMirrors < ActiveRecord::Migration
   end
 
   def down
-<<<<<<< HEAD
     # ee/db/migrate/20160321161032_create_remote_mirrors_ee.rb will remove the table
-=======
-    drop_table(:remote_mirrors) if table_exists?(:remote_mirrors)
->>>>>>> upstream/master
   end
 end