Merge remote-tracking branch 'origin/main' into main

2023-02-06 19:10:57 +11:00
parent 731e2f98a1 7e4483f27b
commit 5767060441
1 changed files with 4 additions and 0 deletions
--- a/index.html
+++ b/index.html
@@ -29,7 +29,11 @@
    <header>
        <div class="container">
            <div style="text-align: center;">
+<<<<<<< HEAD
                <h1 class="display-1 text-center" style="font-weight: bold;margin: 0px;">.tld domains</h1><span style="font-weight: bold;font-size: 40px;"><br>The domain name for...<br><br></span>
+=======
+                <h1 class="display-1 text-center" style="font-weight: bold;margin: 0px;">.tld domains</h1><span style="font-weight: bold;font-size: 40px;"><br>The domain name for Tasmanian residents and businesses.<br><br></span>
+>>>>>>> main
            </div>
        </div>
    </header>