diff options
Diffstat (limited to 'db/schema.rb')
| -rw-r--r-- | db/schema.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/db/schema.rb b/db/schema.rb index a9940be22ff..81cd32e2d83 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,11 @@ # # It's strongly recommended that you check this file into your version control system. +<<<<<<< HEAD ActiveRecord::Schema.define(version: 20170428123910) do +======= +ActiveRecord::Schema.define(version: 20170426181740) do +>>>>>>> origin/master # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" |