resolving merge conflicts

14dd2d12 · John Jarvis · b1202f59 · 49a36130 · 14dd2d12
Commit 14dd2d12 authored Jul 11, 2013 by John Jarvis
Hide whitespace changes
Inline Side-by-side

Showing with 1 additions and 1 deletions

playbooks/roles/edxapp/vars/main.yml
+1 -1

No files found.
--- a/playbooks/roles/edxapp/vars/main.yml
+++ b/playbooks/roles/edxapp/vars/main.yml
@@ -184,7 +184,7 @@ edxapp_theme_version: 'HEAD'

 # make this the public URL instead of writable
 lms_source_repo: https://github.com/edx/edx-platform.git
-lms_version: '5b16fbe3692d984517d870f5eec4c48c9bf1fe16'
+lms_version: 'HEAD'
 local_requirements_file:  "{{ edx_platform_code_dir }}/requirements/edx/local.txt"
 pre_requirements_file:    "{{ edx_platform_code_dir }}/requirements/edx/pre.txt"
 post_requirements_file:   "{{ edx_platform_code_dir }}/requirements/edx/post.txt"