Commit 9d0867ea by cahrens

Merge cleanup.

parent c7e37887
...@@ -2,12 +2,10 @@ import time ...@@ -2,12 +2,10 @@ import time
import logging import logging
import re import re
from datetime import timedelta
from xblock.core import ModelType from xblock.core import ModelType
import datetime import datetime
import dateutil.parser import dateutil.parser
from xblock.core import Integer, Float, Boolean
from django.utils.timezone import UTC from django.utils.timezone import UTC
log = logging.getLogger(__name__) log = logging.getLogger(__name__)
......
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