fix prob merge

newsbox_cms/models.py

@@ -2,17 +2,7 @@
 # Future imports
 from __future__ import unicode_literals
 
-<<<<<<< Updated upstream
-from django.utils.translation import ugettext_lazy as _, ungettext_lazy
-from django.utils import six
-try:
-    from django.utils.encoding import python_2_unicode_compatible
-except ImportError:
-    def python_2_unicode_compatible(f):
-        return f
-=======
 # Django imports
->>>>>>> Stashed changes
 from django.db import models
 from django.utils.translation import ugettext_lazy as _
 from django.utils.translation import ungettext_lazy

newsbox_i18n/models.py

@@ -7,18 +7,6 @@ try:
     from django.urls import reverse
 except ImportError:
     from django.core.urlresolvers import reverse
-<<<<<<< Updated upstream
-from django.utils.translation import ugettext_lazy as _,  get_language
-from django.utils import six
-try:
-    from django.utils.encoding import python_2_unicode_compatible
-except ImportError:
-    def python_2_unicode_compatible(f):
-        return f
-from parler.managers import TranslatableManager, TranslatableQuerySet
-from parler.models import TranslatableModel, TranslatedFields
-=======
-
 # Django imports
 from django.utils.translation import get_language
 from django.utils.translation import ugettext_lazy as _
@@ -30,7 +18,6 @@ from parler.managers import TranslatableManager
 from parler.managers import TranslatableQuerySet
 from parler.models import TranslatableModel
 from parler.models import TranslatedFields
->>>>>>> Stashed changes
 from parler.utils.context import switch_language
 import six