Refactor code

2026-08-18 13:39:41 -04:00 · 2017-08-02 11:07:27 +01:00
parent 6c18c9d6ac
commit b1d1c6881f
2 changed files with 0 additions and 15 deletions
--- a/app/templates/admin_template.html
+++ b/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>