Choose latest schema date version

c7351b39 · Eric Eastwood · e36a5745 · c7351b39
Commit c7351b39 authored Apr 05, 2018 by Eric Eastwood
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: 20180401213713) do
-=======
 ActiveRecord::Schema.define(version: 20180405101928) do
->>>>>>> upstream/master
  # These are extensions that must be enabled in order to support this database
  enable_extension "plpgsql"