Commit a7361354 authored by Bob Van Landuyt's avatar Bob Van Landuyt

Resolve conflicts in `db/schema.rb`

parent 9fadd850
......@@ -11,11 +11,7 @@
#
# It's strongly recommended that you check this file into your version control system.
<<<<<<< HEAD
ActiveRecord::Schema.define(version: 20171010140746) do
=======
ActiveRecord::Schema.define(version: 20171012101043) do
>>>>>>> upstream/master
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
......
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