Fixing test to match CSS

common/test/acceptance/tests/lms/test_lms.py

@@ -116,7 +116,7 @@ class LoginFromCombinedPageTest(UniqueCourseTest):
         self.login_page.visit().password_reset(email=email)
 
         # Expect that we're shown a success message
-        self.assertIn("PASSWORD RESET EMAIL SENT", self.login_page.wait_for_success())
+        self.assertIn("Password Reset Email Sent", self.login_page.wait_for_success())
 
     def test_password_reset_failure(self):
         # Navigate to the password reset form

lms/templates/instructor/instructor_dashboard_2/instructor_dashboard_2.html

@@ -4,6 +4,10 @@
 from django.utils.translation import ugettext as _
 from django.core.urlresolvers import reverse
 %>
+<<<<<<< Updated upstream
+=======
+<%block name="bodyclass">view-incourse view-instructordash</%block>
+>>>>>>> Stashed changes
 
 ## ----- Tips on adding something to the new instructor dashboard -----
 ## 1. add your input element, e.g. in instructor_dashboard2/data_download.html