Resolve conflicts in...

Resolve conflicts in db/migrate/20180503141722_add_remote_mirror_available_overridden_to_projects.rb

Resolve conflicts in...
Resolve conflicts in db/migrate/20180503141722_add_remote_mirror_available_overridden_to_projects.rb
3a22098d · Stan Hu · 1a453b95 · 3a22098d
Commit 3a22098d authored May 07, 2018 by Stan Hu
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

db/migrate/20180503141722_add_remote_mirror_available_overridden_to_projects.rb ...722_add_remote_mirror_available_overridden_to_projects.rb +0 -4

No files found.
--- a/db/migrate/20180503141722_add_remote_mirror_available_overridden_to_projects.rb
+++ b/db/migrate/20180503141722_add_remote_mirror_available_overridden_to_projects.rb
@@ -10,10 +10,6 @@ class AddRemoteMirrorAvailableOverriddenToProjects < ActiveRecord::Migration
  end

  def down
-<<<<<<< HEAD
    # ee/db/migrate/20171017130239_add_remote_mirror_available_overridden_to_projects_ee.rb will remove the column.
-=======
-    remove_column(:projects, :remote_mirror_available_overridden) if column_exists?(:projects, :remote_mirror_available_overridden)
->>>>>>> upstream/master
  end
 end