Fixing conflict

playbooks/roles/edxapp/defaults/main.yml

@@ -470,6 +470,7 @@ generic_env_config:  &edxapp_generic_env
   PLATFORM_TWITTER_ACCOUNT: $EDXAPP_PLATFORM_TWITTER_ACCOUNT
   PLATFORM_FACEBOOK_ACCOUNT: $EDXAPP_PLATFORM_FACEBOOK_ACCOUNT
 
+
 lms_auth_config:
   <<: *edxapp_generic_auth
   PEARSON_TEST_PASSWORD: $EDXAPP_PEARSON_TEST_PASSWORD
@@ -526,7 +527,10 @@ 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"