Remove errors

Add version to timezonefinder

apps/gallery/models.py

@@ -27,13 +27,7 @@ class Image(ProjectBaseMixin, SORLImageMixin, PlatformMixin):
                                                    blank=True, null=True, default=None,
                                                    verbose_name=_('image orientation'))
     title = models.CharField(_('title'), max_length=255, default='')
-
-<<<<<<< HEAD
-    image = ThumbnailerImageField(upload_to=image_path,
-                                  verbose_name=_('Image file'), max_length=255)
-=======
     objects = ImageQuerySet.as_manager()
->>>>>>> develop
 
     class Meta:
         """Meta class."""

requirements/base.txt

@@ -9,7 +9,7 @@ fcm-django
 django-easy-select2
 bootstrap-admin
 drf-yasg==1.16.0
-timezonefinder
+timezonefinder==4.1.0
 PySocks!=1.5.7,>=1.5.6;
 
 djangorestframework==3.9.4