Resolve conflict in schema.rb

ffc63066 · Brett Walker · 1b309608 · ffc63066
Commit ffc63066 authored Feb 02, 2018 by Brett Walker
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: 20180201101405) do
-=======
 ActiveRecord::Schema.define(version: 20180201145907) do
->>>>>>> upstream/master

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