Resolve conflicts in `db/schema.rb`

a7361354 · Bob Van Landuyt · 9fadd850 · a7361354
Commit a7361354 authored Oct 18, 2017 by Bob Van Landuyt
Show 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: 20171010140746) do
-=======
 ActiveRecord::Schema.define(version: 20171012101043) do
->>>>>>> upstream/master

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