Fix conflict in db/schema.rb

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

Fix conflict in db/schema.rb
Signed-off-by: Rémy Coutable <remy@rymai.me>
a0157215 · Rémy Coutable · a608f214 · a0157215
Commit a0157215 authored May 17, 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: 20170508170547) do
-=======
 ActiveRecord::Schema.define(version: 20170511101000) do
->>>>>>> origin/master
  # These are extensions that must be enabled in order to support this database
  enable_extension "plpgsql"