From 2a8ba0bf425f369dd682448d10537f8dbbd2a238 Mon Sep 17 00:00:00 2001 From: Lynne Davis Date: Tue, 3 Mar 2015 16:12:07 +1100 Subject: [PATCH] Fixing merge conflicts after rebase --- app/models/customer.rb | 1 - db/schema.rb | 9 +++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/app/models/customer.rb b/app/models/customer.rb index 3dbdd59a67..f09ffe2e7d 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,5 +1,4 @@ class Customer < ActiveRecord::Base - belongs_to :enterprise validates :code, presence: true, uniqueness: {scope: :enterprise_id} diff --git a/db/schema.rb b/db/schema.rb index 2d4abcce6c..0fc5e6340a 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -156,17 +156,26 @@ 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"