Commit 3a22098d authored by Stan Hu's avatar Stan Hu

Resolve conflicts in...

Resolve conflicts in db/migrate/20180503141722_add_remote_mirror_available_overridden_to_projects.rb
parent 1a453b95
......@@ -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
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment