Solved db/schema.rb

9468c9fc · Jose Ivan Vargas · f29ed174 · 9468c9fc
Commit 9468c9fc authored Jan 11, 2018 by Jose Ivan Vargas
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

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

No files found.
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,11 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.

-<<<<<<< HEAD
 ActiveRecord::Schema.define(version: 20180105233807) do
-=======
-ActiveRecord::Schema.define(version: 20180105212544) do
->>>>>>> upstream/master

  # These are extensions that must be enabled in order to support this database
  enable_extension "plpgsql"