Commit 1d21ca57 authored by Sean McGivern's avatar Sean McGivern

Fix conflicts in db/schema.rb

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