Resolve conflict in db/schema.rb

6ccee496 · Imre Farkas · 1723419b · 6ccee496
Commit 6ccee496 authored Jun 01, 2018 by Imre Farkas
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

db/schema.rb db/schema.rb +0 -3

No files found.
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -2657,13 +2657,10 @@ ActiveRecord::Schema.define(version: 20180529093006) do
    t.boolean "notified_of_own_activity"
    t.boolean "support_bot"
    t.string "preferred_language"
-<<<<<<< HEAD
    t.boolean "email_opted_in"
    t.string "email_opted_in_ip"
    t.integer "email_opted_in_source_id"
    t.datetime "email_opted_in_at"
-=======
->>>>>>> upstream/master
    t.integer "theme_id", limit: 2
    t.integer "accepted_term_id"
    t.string "feed_token"