Fix schema.rb conflict resolution

78bf5863 · Michael Kozono · 16260dee · 78bf5863
Commit 78bf5863 authored Jan 09, 2018 by Michael Kozono
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

db/schema.rb db/schema.rb +0 -1

No files found.
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -178,7 +178,6 @@ ActiveRecord::Schema.define(version: 20171230123729) do
    t.integer "gitaly_timeout_medium", default: 30, null: false
    t.integer "gitaly_timeout_fast", default: 10, null: false
    t.boolean "mirror_available", default: true, null: false
-    t.boolean "authorized_keys_enabled", default: true, null: false
  end

  create_table "approvals", force: :cascade do |t|