nathanwoodburn/nictemplate
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Nathan Woodburn 2023-02-06 19:10:57 +11:00
commit 5767060441
No known key found for this signature in database
GPG Key ID: FBA777D17CAD88B5
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
index.html
View File

@ -29,7 +29,11 @@
<header> <header>
<div class="container"> <div class="container">
<div style="text-align: center;"> <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...<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>
</div> </div>
</header> </header>