Commit 69b60927 authored by Yorick Peterse's avatar Yorick Peterse

Resolved conflict in db/schema.rb

parent 60335e51
......@@ -2254,10 +2254,7 @@ ActiveRecord::Schema.define(version: 20180204200836) do
t.string "model_type"
t.string "uploader", null: false
t.datetime "created_at", null: false
<<<<<<< HEAD
t.integer "store"
=======
>>>>>>> upstream/master
t.string "mount_point"
t.string "secret"
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