fixed conflict

2019-11-25 09:26:21 +06:30
parent 3b468b78f4 d1ab2c194d
commit 6fbf30c950
109 changed files with 1082 additions and 1082 deletions
--- a/app/controllers/api/orders_controller.rb
+++ b/app/controllers/api/orders_controller.rb
@@ -46,7 +46,7 @@ class Api::OrdersController <  Api::ApiController
      @tax_profile = TaxProfile.where("lower(group_type)='cashier'")
    # end

-    @shop = Shop.first
+    # @shop = Shop.first
    puts "Hello world"
    puts @shop.to_json
    return @shop.to_json