Resolve conflicts in db/migrate/20180503193953_add_mirror_available_to_application_settings.rb

940948f9 · Stan Hu · f13a1e5f · 940948f9
Commit 940948f9 authored May 07, 2018 by Stan Hu
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

db/migrate/20180503193953_add_mirror_available_to_application_settings.rb ...503193953_add_mirror_available_to_application_settings.rb +0 -4

No files found.
--- a/db/migrate/20180503193953_add_mirror_available_to_application_settings.rb
+++ b/db/migrate/20180503193953_add_mirror_available_to_application_settings.rb
@@ -10,10 +10,6 @@ class AddMirrorAvailableToApplicationSettings < ActiveRecord::Migration
  end

  def down
-<<<<<<< HEAD
    # ee/db/migrate/20171017125928_add_remote_mirror_available_to_application_settings.rb will remove the column.
-=======
-    remove_column(:application_settings, :mirror_available) if column_exists?(:application_settings, :mirror_available)
->>>>>>> upstream/master
  end
 end