Merge pull request #12417 from edx/bjacobel/fix-release-2016-05-10-merge-conflicts-with-master

Fix release 2016 05 10 merge conflicts with master
2016-05-10 13:03:19 -04:00
parent 599070e5ef d88aad7d79
commit e8d2a626d4
1 changed files with 0 additions and 1 deletions
--- a/common/test/acceptance/tests/lms/test_lms.py
+++ b/common/test/acceptance/tests/lms/test_lms.py
@@ -9,7 +9,6 @@ from unittest import skip
 from nose.plugins.attrib import attr
 import pytz
 import urllib
-from ..helpers import skip_if_browser

 from bok_choy.promise import EmptyPromise
 from ..helpers import (