Fix Conflict

2017-08-16 18:38:41 +06:30
parent fc2927b341 4fc748e877
commit 0138ae2efa
13 changed files with 220 additions and 2 deletions
--- a/db/migrate/20170816042256_settings_products.rb
+++ b/db/migrate/20170816042256_settings_products.rb
@@ -1,4 +1,4 @@
-class CreateProduct < ActiveRecord::Migration[5.1]
+class SettingsProducts < ActiveRecord::Migration[5.1]
  def change
    create_table :products do |t|
      t.string :item_code, :limit => 16