Commit 0a00c5cb authored by Brett Walker's avatar Brett Walker

Fix conflict in db/schema.rb for CE-to-EE merge

parent 98266e04
......@@ -11,11 +11,7 @@
#
# It's strongly recommended that you check this file into your version control system.
<<<<<<< HEAD
ActiveRecord::Schema.define(version: 20181017131623) do
=======
ActiveRecord::Schema.define(version: 20181017001059) 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