fixed conflict

2017-03-08 14:08:11 +06:30
parent 93085271a9
commit 01a2c617c5
2 changed files with 2 additions and 4 deletions
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -54,11 +54,9 @@ ActiveRecord::Schema.define(version: 20170210103359) do

  create_table "clients", force: :cascade do |t|
    t.string   "name",          null: false
-    t.string   "nrc"
    t.string   "email"
    t.string   "phone"
    t.string   "address"
-    t.string   "product_type"
    t.string   "secrect_key"
    t.datetime "created_at",    null: false
    t.datetime "updated_at",    null: false