fix prob merge

newsbox/models.py

@@ -18,15 +18,14 @@ except ImportError:
 
 # Django imports
 from django.db import models
-<<<<<<< Updated upstream
-from django.utils import six
+
 try:
+    # Django imports
     from django.utils.encoding import python_2_unicode_compatible
 except ImportError:
     def python_2_unicode_compatible(f):
         return f
-=======
->>>>>>> Stashed changes
+# Django imports
 from django.utils.functional import lazy
 from django.utils.safestring import mark_safe
 from django.utils.timezone import now