glenux-contrib/metamaps--metamaps
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

bad merge

Browse source
This commit is contained in:
Connor Turland 2017-02-11 14:02:19 +00:00
parent b11a4c71d1
commit 014aaac307
3 changed files with 0 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
app/views/map_mailer/activity.html.erb
View file

0
app/views/map_mailer/activity.text.erb
View file

6
db/schema.rb
View file

@ -82,12 +82,6 @@ ActiveRecord::Schema.define(version: 20170209215911) do
create_table "follows", force: :cascade do |t| create_table "follows", force: :cascade do |t|
t.integer "user_id" 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.string "followed_type"
t.integer "followed_id" t.integer "followed_id"
t.datetime "created_at", null: false t.datetime "created_at", null: false