Fix merge conflict

diff --git a/template/base.html b/template/base.html
index 765fe69ec71a121dabb3a82a537f37276d630247..51b5ea47b0fa9bec616eb6bd5afabd40f8fad0d0 100644 (file)
--- a/template/base.html
+++ b/template/base.html
@@ -61,11 +61,7 @@
            <!-- Footer -->
            <footer id="side">
                <p>
-<<<<<<< HEAD
-               <a href="/code-of-conduct">Code of Conduct</a> | @PGDayAU | <a href="mailto:pgdu-committee@lists.pgdu.org">pgdu-committee@lists.pgdu.org</a> | © 2019 PostgreSQL Down Under Inc.
-=======
                <a href="/code-of-conduct">Code of Conduct</a> | @PGDU | <a href="mailto:pgdu-committee@lists.pgdu.org">pgdu-committee@lists.pgdu.org</a> | © 2019 PostgreSQL Down Under Inc.
->>>>>>> testing
          </p>
       </footer>