From 3ea7ff766a7336a9f57ca82f58805798865e6e41 Mon Sep 17 00:00:00 2001 From: Lynne Davis Date: Tue, 3 Mar 2015 16:29:17 +1100 Subject: [PATCH] Removing additional merge conflicts --- db/schema.rb | 9 --------- 1 file changed, 9 deletions(-) diff --git a/db/schema.rb b/db/schema.rb index 0fc5e6340a..2d4abcce6c 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -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"