Skip to content

R
red-ci-cd
Commit 9d3e0037 authored by John Red Medrano's avatar John Red Medrano
Browse files
Options

Merge branch 'red-develop' into 'product-dev' 

fixing

See merge request rms/Backend/api-main-service!911
parents a2ffee2d 51411184
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 4 deletions
app/applicationlayer/utils.py
View file @ 9d3e0037
...@@ -26,10 +26,6 @@ app_id = config['SETTINGS']['app_id'], ...@@ -26,10 +26,6 @@ app_id = config['SETTINGS']['app_id'],
key = config['SETTINGS']['key'] key = config['SETTINGS']['key']
secret = config['SETTINGS']['secret'] secret = config['SETTINGS']['secret']
cluster = config['SETTINGS']['cluster'] cluster = config['SETTINGS']['cluster']
<<<<<<< HEAD
# ssl = if config['SETTINGS']['ssl'] == 1 True else
=======
>>>>>>> e6304df2e1235506235d9d1491084d7aefb02e8d
ssl = True if config['SETTINGS']['ssl'] == 1 else False ssl = True if config['SETTINGS']['ssl'] == 1 else False
cms_notification = config['SETTINGS']['cms_notification'] cms_notification = config['SETTINGS']['cms_notification']
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment