Skip to content

E
edx-platform
Commit d88aad7d by Brian Jacobel
Options

Merge branch 'release' into bjacobel/fix-release-2016-05-10-merge-conflicts-with-master

parents 64041503 8a5a69f4
Showing with 0 additions and 1 deletions
common/test/acceptance/tests/lms/test_lms.py
...@@ -9,7 +9,6 @@ from unittest import skip ...@@ -9,7 +9,6 @@ from unittest import skip
from nose.plugins.attrib import attr from nose.plugins.attrib import attr
import pytz import pytz
import urllib import urllib
from ..helpers import skip_if_browser
from bok_choy.promise import EmptyPromise from bok_choy.promise import EmptyPromise
from ..helpers import ( from ..helpers import (
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment