Refactor code after rebase

app/__init__.py

@@ -55,11 +55,8 @@ from app.notify_client.organisations_client import OrganisationsClient
 from app.notify_client.models import AnonymousUser
 from app.notify_client.letter_jobs_client import LetterJobsClient
 from app.utils import get_cdn_domain
-<<<<<<< HEAD
 
 from app.utils import gmt_timezones
-=======
->>>>>>> Update emails to use logos cdn
 
 login_manager = LoginManager()
 csrf = CSRFProtect()

app/utils.py

@@ -1,21 +1,14 @@
 import re
 import csv
-<<<<<<< HEAD
 import pytz
-=======
-from datetime import datetime, timedelta, timezone
->>>>>>> Update emails to use logos cdn
 from io import StringIO
 from os import path
 from functools import wraps
 import unicodedata
 from urllib.parse import urlparse
-<<<<<<< HEAD
 from collections import namedtuple
 from datetime import datetime, timedelta, timezone
 from dateutil import parser
-=======
->>>>>>> Update emails to use logos cdn
 
 import dateutil
 import ago
@@ -337,7 +330,6 @@ def email_or_sms_not_enabled(template_type, permissions):
     return (template_type in ['email', 'sms']) and (template_type not in permissions)
 
 
-<<<<<<< HEAD
 def get_letter_timings(upload_time):
 
     LetterTimings = namedtuple(
@@ -375,8 +367,6 @@ def gmt_timezones(date):
     return forced_utc.astimezone(pytz.timezone('Europe/London'))
 
 
-=======
->>>>>>> Update emails to use logos cdn
 def get_cdn_domain():
     parsed_uri = urlparse(current_app.config['ADMIN_BASE_URL'])