Skip to content

C
configuration
Commit 490786b1 by Han Su Kim
Options

Fixing conflict

parent f004a86e
Showing with 0 additions and 3 deletions
playbooks/roles/edxapp/defaults/main.yml
...@@ -527,10 +527,7 @@ cms_auth_config: ...@@ -527,10 +527,7 @@ cms_auth_config:
<<: *edxapp_generic_auth <<: *edxapp_generic_auth
cms_env_config: cms_env_config:
<<: *edxapp_generic_env <<: *edxapp_generic_env
<<<<<<< HEAD
SITE_NAME: $EDXAPP_CMS_SITE_NAME SITE_NAME: $EDXAPP_CMS_SITE_NAME
=======
>>>>>>> release
# install dir for the edx-platform repo # install dir for the edx-platform repo
edxapp_code_dir: "{{ edxapp_app_dir }}/edx-platform" edxapp_code_dir: "{{ edxapp_app_dir }}/edx-platform"
......
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