Midcourse reverification: fixing broken tests

Also, refactored code representing ReverifyInfo
2014-01-29 19:24:11 +00:00
parent 86588c492b
commit 3aa80654cb
6 changed files with 20 additions and 20 deletions
--- a/cms/envs/common.py
+++ b/cms/envs/common.py
@@ -451,7 +451,6 @@ INSTALLED_APPS = (

    # for managing course modes
    'course_modes',
-<<<<<<< HEAD

    # Dark-launching languages
    'dark_lang',