Resolve conflict in db/schema.rb

Signed-off-by: Rémy Coutable <remy@rymai.me>

db/schema.rb

@@ -11,11 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-<<<<<<< HEAD
-ActiveRecord::Schema.define(version: 20171012101043) do
-=======
 ActiveRecord::Schema.define(version: 20171017130239) do
->>>>>>> origin/master
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -161,14 +157,11 @@ ActiveRecord::Schema.define(version: 20171017130239) do
     t.boolean "hashed_storage_enabled", default: false, null: false
     t.boolean "project_export_enabled", default: true, null: false
     t.boolean "auto_devops_enabled", default: false, null: false
-<<<<<<< HEAD
     t.integer "circuitbreaker_failure_count_threshold", default: 160
     t.integer "circuitbreaker_failure_wait_time", default: 30
     t.integer "circuitbreaker_failure_reset_time", default: 1800
     t.integer "circuitbreaker_storage_timeout", default: 30
-=======
     t.boolean "remote_mirror_available", default: true, null: false
->>>>>>> origin/master
   end
 
   create_table "approvals", force: :cascade do |t|