Remove a final conflict in db/schema.rb

fc57aab8 · Nick Thomas · 5f9109e5 · fc57aab8
Commit fc57aab8 authored Apr 20, 2017 by Nick Thomas
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: 20170419065104) do
-=======
-ActiveRecord::Schema.define(version: 20170419001229) do
->>>>>>> ce/master

  # These are extensions that must be enabled in order to support this database
  enable_extension "plpgsql"