From 014aaac30700faf876da099f007e77b7e6a75dfa Mon Sep 17 00:00:00 2001
From: Connor Turland <connorturland@gmail.com>
Date: Sat, 11 Feb 2017 14:02:19 +0000
Subject: [PATCH] bad merge

---
 app/views/map_mailer/activity.html.erb | 0
 app/views/map_mailer/activity.text.erb | 0
 db/schema.rb                           | 6 ------
 3 files changed, 6 deletions(-)
 delete mode 100644 app/views/map_mailer/activity.html.erb
 delete mode 100644 app/views/map_mailer/activity.text.erb

diff --git a/app/views/map_mailer/activity.html.erb b/app/views/map_mailer/activity.html.erb
deleted file mode 100644
index e69de29b..00000000
diff --git a/app/views/map_mailer/activity.text.erb b/app/views/map_mailer/activity.text.erb
deleted file mode 100644
index e69de29b..00000000
diff --git a/db/schema.rb b/db/schema.rb
index aff5b9e6..66bbf9cd 100644
--- 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