Commit 4c618cf3 authored by Sean McGivern's avatar Sean McGivern

Resolve conflicts in db/schema.rb

parent df98dc80
......@@ -1559,12 +1559,9 @@ ActiveRecord::Schema.define(version: 20180816193530) do
add_index "lists", ["board_id", "label_id"], name: "index_lists_on_board_id_and_label_id", unique: true, using: :btree
add_index "lists", ["label_id"], name: "index_lists_on_label_id", using: :btree
<<<<<<< HEAD
add_index "lists", ["list_type"], name: "index_lists_on_list_type", using: :btree
add_index "lists", ["milestone_id"], name: "index_lists_on_milestone_id", using: :btree
add_index "lists", ["user_id"], name: "index_lists_on_user_id", using: :btree
=======
add_index "lists", ["list_type"], name: "index_lists_on_list_type", using: :btree
>>>>>>> upstream/master
create_table "members", force: :cascade do |t|
t.integer "access_level", null: false
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment