Resolved conflict in db/schema.rb

69b60927 · Yorick Peterse · 60335e51 · 69b60927
Commit 69b60927 authored Feb 06, 2018 by Yorick Peterse
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

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

No files found.
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -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