fixed conflictfile

2017-06-12 15:01:19 +06:30
parent e90178cfdc 105581a7de
commit dc51beae43
30 changed files with 699 additions and 353 deletions
--- a/db/migrate/20170611084537_create_membership_actions.rb
+++ b/db/migrate/20170611084537_create_membership_actions.rb
@@ -8,7 +8,7 @@ class CreateMembershipActions < ActiveRecord::Migration[5.1]
      t.string :auth_token
      t.string :merchant_account_id
      t.string :created_by
-      t.string :additional_parameter,array: true, :default =>'{}'
+      t.json :additional_parameter

      t.timestamps
    end