fixed conflict/

2019-11-15 13:54:28 +06:30
parent 6bb545d382 dd6e8142b4
commit b1ff773ac7
44 changed files with 933 additions and 400 deletions
--- a/config/initializers/license.rb
+++ b/config/initializers/license.rb
@@ -1,6 +1,8 @@
-if File.exist?("config/license.yml")   
+if File.exist?("config/license.yml")
 	config = YAML.load_file(Rails.root.join("config/license.yml"))
 	config.fetch(Rails.env, {}).each do |key, value|
 	  ENV[key.upcase] = value.to_s
 	end
-end
+else
+	ENV["SERVER_MODE"] = "cloud"
+end