Fix conflicts

2016-03-10 10:33:09 -03:00 · 2016-03-10 10:33:09 -03:00 · de251bcf6d
parent 96fc1d9092
commit de251bcf6d
1 changed files with 1 additions and 0 deletions
--- a/db/schema.rb
+++ b/db/schema.rb
@ -12,6 +12,7 @@
 # It's strongly recommended that you check this file into your version control system.

 ActiveRecord::Schema.define(version: 20160308212903) do
+
  # These are extensions that must be enabled in order to support this database
  enable_extension "plpgsql"