fixed conflict

2017-06-08 09:57:33 +06:30
parent 3cf00faab8 06ccdac0c2
commit d6a455b135
58 changed files with 893 additions and 438 deletions
--- a/db/migrate/20170331024749_create_menu_items.rb
+++ b/db/migrate/20170331024749_create_menu_items.rb
@@ -1,4 +1,5 @@
- class CreateMenuItems < ActiveRecord::Migration[5.0]
+
+class CreateMenuItems < ActiveRecord::Migration[5.1]
  def change
    create_table :menu_items do |t|
      t.string :item_code, :null => false