fixed conflict after merch dev for current shop

config/cable.yml

@@ -4,4 +4,4 @@ redis: &redis
 
 production: *redis
 development: *redis
-test: *redis
+test: *redis

config/initializers/license.rb

@@ -3,6 +3,4 @@ if File.exist?("config/license.yml")
 	config.fetch(Rails.env, {}).each do |key, value|
 	  ENV[key.upcase] = value.to_s
 	end
-else
-	ENV["SERVER_MODE"] = "cloud"
 end

config/redis.yml

@@ -10,4 +10,4 @@ test:
 
 production:
   <<: *default
-  url: redis://127.0.0.1:6379
+  url: redis://127.0.0.1:6379

config/secrets.yml

@@ -11,8 +11,8 @@
 # if you're sharing your code publicly.
 
 development:
- secret_key_base: b61d85f8ed2a1a9e0eeece3443b3e8f838d002cc1d9f32115d8e93db920e2957adfedc57501d44741211538f3108b742cdeada87d5bfae796c53da1f90a3cd61  
- sx_provision_url: connect.smartsales.asia/api #connect.smartsales.dev/api #connect.smartsales.asia/api  #provision.zsai.ws/api   
+ secret_key_base: b61d85f8ed2a1a9e0eeece3443b3e8f838d002cc1d9f32115d8e93db920e2957adfedc57501d44741211538f3108b742cdeada87d5bfae796c53da1f90a3cd61
+ sx_provision_url: connect.smartsales.asia/api #connect.smartsales.dev/api #connect.smartsales.asia/api  #provision.zsai.ws/api
  server_mode: application
  cipher_type: AES-256-CBC
  sx_key: Wh@t1$C2L
@@ -23,8 +23,8 @@ test:
 # Do not keep production secrets in the repository,
 # instead read values from the environment.
 production:
- secret_key_base: c4bc81065013f9a3506d385bcbd49586c42e586488144b0de90c7da36867de9fa880f46b5c4f86f0ce9b7c783bb5a73bdb0e5605a47716567294390e726d3e22  
- sx_provision_url: connect.smartsales.asia/api #192.168.1.147:3002/api
+ secret_key_base: c4bc81065013f9a3506d385bcbd49586c42e586488144b0de90c7da36867de9fa880f46b5c4f86f0ce9b7c783bb5a73bdb0e5605a47716567294390e726d3e22
+ sx_provision_url: connect.smartsales.asia/api #52.221.188.144:9292/api #192.168.1.147:3002/api
  server_mode: application
  cipher_type: AES-256-CBC
  sx_key: Wh@t1$C2L