Resolve conflict in db/schema.rb

Signed-off-by: Rémy Coutable <remy@rymai.me>

Resolve conflict in db/schema.rb
Signed-off-by: Rémy Coutable <remy@rymai.me>
794927c2 · Rémy Coutable · 97b29d63 · 794927c2
Commit 794927c2 authored Nov 22, 2017 by Rémy Coutable
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: 20171120145444) do
-=======
 ActiveRecord::Schema.define(version: 20171121144800) do
->>>>>>> upstream/master
  # These are extensions that must be enabled in order to support this database
  enable_extension "plpgsql"