Resolve conflict in db/schema.rb

[ci skip]

db/schema.rb

@@ -426,11 +426,8 @@ ActiveRecord::Schema.define(version: 20180305144721) do
     t.datetime_with_timezone "updated_at", null: false
     t.datetime_with_timezone "expire_at"
     t.string "file"
-<<<<<<< HEAD
     t.integer "file_store"
-=======
     t.binary "file_sha256"
->>>>>>> upstream/master
   end
 
   add_index "ci_job_artifacts", ["expire_at", "job_id"], name: "index_ci_job_artifacts_on_expire_at_and_job_id", using: :btree