Fix conflicts

de251bcf · Felipe Artur · 96fc1d90 · de251bcf
Commit de251bcf authored Mar 10, 2016 by Felipe Artur
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

db/schema.rb db/schema.rb +1 -0

No files found.
--- 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"