Resolve db/schema.rb

0ae5d4bb · Robert Speicher · 75d9b938 · 0ae5d4bb
Commit 0ae5d4bb authored Jun 26, 2018 by Robert Speicher
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: 20180612175636) do
-=======
 ActiveRecord::Schema.define(version: 20180626125654) do
->>>>>>> upstream/master

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