fix prob merge

newsbox/models.py

@@ -18,14 +18,6 @@ except ImportError:
 
 # Django imports
 from django.db import models
-
-try:
-    # Django imports
-    from django.utils.encoding import python_2_unicode_compatible
-except ImportError:
-    def python_2_unicode_compatible(f):
-        return f
-# Django imports
 from django.utils.functional import lazy
 from django.utils.safestring import mark_safe
 from django.utils.timezone import now