Resolve conflicts in 20160301174731_add_fingerprint_index.rb

fc8fb191 · Michael Kozono · 75b49b70 · fc8fb191
Commit fc8fb191 authored Jan 09, 2018 by Michael Kozono
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

db/migrate/20160301174731_add_fingerprint_index.rb db/migrate/20160301174731_add_fingerprint_index.rb +0 -3

No files found.
--- a/db/migrate/20160301174731_add_fingerprint_index.rb
+++ b/db/migrate/20160301174731_add_fingerprint_index.rb
@@ -2,11 +2,8 @@
 class AddFingerprintIndex < ActiveRecord::Migration
  disable_ddl_transaction!

-<<<<<<< HEAD
-=======
  DOWNTIME = false

->>>>>>> upstream/master
  # https://gitlab.com/gitlab-org/gitlab-ee/issues/764
  def change
    args = [:keys, :fingerprint]