Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Fix release 2016 05 10 merge conflicts with master
This commit is contained in:
Brian Jacobel
2016-05-10 13:03:19 -04:00
parent 599070e5ef d88aad7d79
commit e8d2a626d4
1 changed files with 0 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
common/test/acceptance/tests/lms/test_lms.py
View File

@@ -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 (