bad merge

2017-02-11 14:02:19 +00:00 · 2017-02-11 14:02:19 +00:00 · 014aaac307
commit 014aaac307
parent b11a4c71d1
3 changed files with 0 additions and 6 deletions
--- a/app/views/map_mailer/activity.html.erb
+++ b/app/views/map_mailer/activity.html.erb
--- a/app/views/map_mailer/activity.text.erb
+++ b/app/views/map_mailer/activity.text.erb
--- a/db/schema.rb
+++ b/db/schema.rb
@ -82,12 +82,6 @@ ActiveRecord::Schema.define(version: 20170209215911) do

  create_table "follows", force: :cascade do |t|
    t.integer  "user_id"
-<<<<<<< HEAD
-    t.boolean  "email",         default: true
-    t.boolean  "app",           default: true
-    t.boolean  "push",          default: true
-=======
->>>>>>> develop
    t.string   "followed_type"
    t.integer  "followed_id"
    t.datetime "created_at",                   null: false