Fixed conflicts in schema.rb

coopdevs · May 22, 2018 · 265cbab · 265cbab
1 parent c268502
commit 265cbab
Showing 1 changed file with 0 additions and 14 deletions.
diff --git a/db/schema.rb b/db/schema.rb
@@ -77,25 +77,18 @@
   add_index "documents", ["label"], name: "index_documents_on_label", using: :btree
 
   create_table "events", force: :cascade do |t|
-<<<<<<< HEAD
     t.integer  "action",      null: false
-=======
-    t.string   "action",      null: false
->>>>>>> Added migration to add a push_notifications columns to the users table
     t.integer  "post_id"
     t.integer  "member_id"
     t.integer  "transfer_id"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
-<<<<<<< HEAD
   add_index "events", ["member_id"], name: "index_events_on_member_id", unique: true, where: "(member_id IS NOT NULL)", using: :btree
   add_index "events", ["post_id"], name: "index_events_on_post_id", unique: true, where: "(post_id IS NOT NULL)", using: :btree
   add_index "events", ["transfer_id"], name: "index_events_on_transfer_id", unique: true, where: "(transfer_id IS NOT NULL)", using: :btree
 
-=======
->>>>>>> Added migration to add a push_notifications columns to the users table
   create_table "members", force: :cascade do |t|
     t.integer  "user_id"
     t.integer  "organization_id"
@@ -181,13 +174,6 @@
     t.integer "post_id"
   end
 
-  create_table "user_settings", force: :cascade do |t|
-    t.integer "user_id"
-    t.boolean "push_notifications_all"
-  end
-
-  add_index "user_settings", ["user_id"], name: "index_user_settings_on_user_id", using: :btree
-
   create_table "users", force: :cascade do |t|
     t.string   "username",                              null: false
     t.string   "email",                                 null: false