Resolve conflicts in db/schema.rb

75ed6921 · Stan Hu · 940948f9 · 75ed6921
Commit 75ed6921 authored May 07, 2018 by Stan Hu
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: 20180503193953) do
-=======
 ActiveRecord::Schema.define(version: 20180503200320) do
->>>>>>> upstream/master
  # These are extensions that must be enabled in order to support this database
  enable_extension "plpgsql"