fixing bad merge conflict

playbooks/roles/edxapp/defaults/main.yml

@@ -166,6 +166,8 @@ edxapp_staticfile_dir: "{{ edxapp_data_dir }}/staticfiles"
 edxapp_course_data_dir: "{{ edxapp_data_dir }}/data"
 edxapp_upload_dir: "{{ edxapp_data_dir }}/uploads"
 edxapp_theme_dir: "{{ edxapp_data_dir }}/themes"
+edxapp_git_identity: "{{ edxapp_app_dir }}/{{ EDXAPP_LOCAL_GIT_IDENTITY|basename }}"
+edxapp_git_ssh: "/tmp/edxapp_git_ssh.sh"
 edxapp_pypi_local_mirror: "http://localhost:{{ devpi_port }}/root/pypi/+simple"
 edxapp_workers:
   - queue: low
@@ -521,4 +523,4 @@ worker_django_settings_module: 'aws'
 # commands listed here will be symlinked to ~/bin/ for
 # the automator user.
 edxapp_automated_rbash_links:
-  - /usr/bin/sudo
\ No newline at end of file
+  - /usr/bin/sudo