git_admin/nemo_encoder
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed conflict

Browse Source
This commit is contained in:
nandar
2017-03-08 14:08:11 +06:30
parent 93085271a9
commit 01a2c617c5
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
config/database.yml
View File

@@ -11,7 +11,7 @@ default: &default
development: development:
<<: *default <<: *default
database: nemo_encoder database: nemo_encoder_production
username: nda username: nda
# Warning: The database defined as "test" will be erased and # Warning: The database defined as "test" will be erased and
@@ -19,7 +19,7 @@ development:
# Do not set this db to the same as development or production. # Do not set this db to the same as development or production.
test: test:
<<: *default <<: *default
database: nemo_encoder database: nemo_encoder_production_test
production: production:
<<: *default <<: *default

2
db/schema.rb
View File

@@ -54,11 +54,9 @@ ActiveRecord::Schema.define(version: 20170210103359) do
create_table "clients", force: :cascade do |t| create_table "clients", force: :cascade do |t|
t.string "name", null: false t.string "name", null: false
t.string "nrc"
t.string "email" t.string "email"
t.string "phone" t.string "phone"
t.string "address" t.string "address"
t.string "product_type"
t.string "secrect_key" t.string "secrect_key"
t.datetime "created_at", null: false t.datetime "created_at", null: false
t.datetime "updated_at", null: false t.datetime "updated_at", null: false