Fix conflicts in db/schema.rb

1d21ca57 · Sean McGivern · 8c7de34c · 1d21ca57
Commit 1d21ca57 authored Apr 20, 2018 by Sean McGivern
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: 20180419031622) do
-=======
-ActiveRecord::Schema.define(version: 20180418053107) do
->>>>>>> upstream/master

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