Refactor code

app/templates/admin_template.html

@@ -49,8 +49,6 @@
                 <li>
                   <a href="{{ url_for('main.platform_admin') }}">Platform admin</a>
                 </li>
-<<<<<<< HEAD
-=======
                 <li>
                   <a href="{{ url_for('main.view_providers') }}">Providers</a>
                 </li>
@@ -60,7 +58,6 @@
                 <li>
                   <a href="{{ url_for('main.letter_jobs') }}">Letter jobs</a>
                 </li>
->>>>>>> Add org select and manage pages
             {% endif %}
             <li>
               <a href="{{ url_for('main.sign_out')}}">Sign out</a>

tests/app/test_utils.py

@@ -12,10 +12,7 @@ from app.utils import (
     generate_previous_dict,
     generate_next_dict,
     Spreadsheet,
-<<<<<<< HEAD
     get_letter_timings,
-=======
->>>>>>> Update emails to use logos cdn
     get_cdn_domain
 )
 
@@ -295,22 +292,13 @@ def test_get_estimated_delivery_date_for_letter(
     assert timings.latest_delivery.strftime('%A %Y-%m-%d') == expected_latest
 
 
-=======
->>>>>>> Update emails to use logos cdn
 def test_get_cdn_domain_on_localhost(client, mocker):
     mocker.patch.dict('app.current_app.config', values={'ADMIN_BASE_URL': 'http://localhost:6012'})
-=======
-def test_get_cdn_domain_on_localhost(client):
->>>>>>> Update config to new s3 bucket names
     domain = get_cdn_domain()
     assert domain == 'static-logos.notify.tools'
 
 
-<<<<<<< HEAD
 def test_get_cdn_domain_on_non_localhost(client, mocker):
-=======
-def test_get_cdn_domain_without_logo_base_domain_env_returns_admin_base_domain(client, mocker):
->>>>>>> Update emails to use logos cdn
     mocker.patch.dict('app.current_app.config', values={'ADMIN_BASE_URL': 'https://some.admintest.com'})
     domain = get_cdn_domain()
     assert domain == 'static-logos.admintest.com'