raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-03 02:21:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removing additional merge conflicts

Browse Source
This commit is contained in:
Lynne Davis
2015-03-03 16:29:17 +11:00
parent 3d491d7b5e
commit 3ea7ff766a
1 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
db/schema.rb
View File

@@ -156,26 +156,17 @@ ActiveRecord::Schema.define(:version => 20150220035501) do
add_index "coordinator_fees", ["order_cycle_id"], :name => "index_coordinator_fees_on_order_cycle_id"
create_table "customers", :force => true do |t|
<<<<<<< HEAD
t.string "email", :null => false
t.integer "enterprise_id", :null => false
t.string "code", :null => false
t.integer "user_id"
=======
t.string "email"
t.integer "enterprise_id"
t.string "code"
>>>>>>> a3df4bf0262154d8dfa3667f6e20d09fc8dca77c
t.datetime "created_at", :null => false
t.datetime "updated_at", :null => false
end
add_index "customers", ["email"], :name => "index_customers_on_email"
add_index "customers", ["enterprise_id", "code"], :name => "index_customers_on_enterprise_id_and_code", :unique => true
<<<<<<< HEAD
add_index "customers", ["user_id"], :name => "index_customers_on_user_id"
=======
>>>>>>> a3df4bf0262154d8dfa3667f6e20d09fc8dca77c
create_table "distributors_payment_methods", :id => false, :force => true do |t|
t.integer "distributor_id"