Resolve conflict in db/schema.rb

026a5d73 · Valery Sizov · 551c2aea · 026a5d73
Commit 026a5d73 authored May 08, 2017 by Valery Sizov
Show 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: 20170504102911) do
-=======
-ActiveRecord::Schema.define(version: 20170503185032) do
->>>>>>> b3e5109689a971c2574da51a1683d5e424a31564
  # These are extensions that must be enabled in order to support this database
  enable_extension "plpgsql"