Fixing conflict

490786b1 · Han Su Kim · f004a86e · 490786b1
Commit 490786b1 authored Jun 25, 2014 by Han Su Kim
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

playbooks/roles/edxapp/defaults/main.yml
+0 -3

No files found.
--- a/playbooks/roles/edxapp/defaults/main.yml
+++ b/playbooks/roles/edxapp/defaults/main.yml
@@ -527,10 +527,7 @@ cms_auth_config:
  <<: *edxapp_generic_auth
 cms_env_config:
  <<: *edxapp_generic_env
-<<<<<<< HEAD
  SITE_NAME:  $EDXAPP_CMS_SITE_NAME
-=======
->>>>>>> release

 # install dir for the edx-platform repo
 edxapp_code_dir: "{{ edxapp_app_dir }}/edx-platform"