amberisvibin/ambersplace.net
1
0
Fork 0
Code Issues Pull Requests Activity

fixed git shit

Browse Source
This commit is contained in:
Amber
2024-10-07 07:44:21 -04:00
parent 050671d22a
commit 25853a72d0
3 changed files with 4 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
news.html
View File

@@ -9,9 +9,6 @@
<body>
<h1>news</h1>
<article>
<<<<<<< Updated upstream
=======
<<<<<<< HEAD
<h1>Hello.</h1>
<p><i>October 4th, 2024</i></p>
@@ -32,25 +29,14 @@
<p>Sorry for the sad article, but it reflects how I'm feeling these days. I love y'all. Stay safe.</p>
</article>
<article>
=======
>>>>>>> 9620d2226b562cd18df820afe51146cfd2d94968
>>>>>>> Stashed changes
<h1>Hi!</h1>
<p><i>September 13th, 2024</i></p>
<p>"Holy shit, an update that didn't take 3 months" - ambersplace viewer </p>
<<<<<<< Updated upstream
<p>I updated the computers page. I'll be adding images soon. At some point I'll be updating the minidisc page, my collection has grown substantially.</p>
=======
<<<<<<< HEAD
<p>I updated the computers page. I'll be adding images soon. At some point I'll be updating the minidisc page,
my collection has grown substantially.</p>
=======
<p>I updated the computers page. I'll be adding images soon. At some point I'll be updating the minidisc page, my collection has grown substantially.</p>
>>>>>>> 9620d2226b562cd18df820afe51146cfd2d94968
>>>>>>> Stashed changes
<p>Hope you're doing well.</p>
</article>
@@ -165,15 +151,7 @@
<footer>
<a href="/">back home</a>
<<<<<<< Updated upstream
<p><i>Updated September 13th, 2024</i></p>
=======
<<<<<<< HEAD
<p><i>Updated October 4th, 2024</i></p>
=======
<p><i>Updated September 13th, 2024</i></p>
>>>>>>> 9620d2226b562cd18df820afe51146cfd2d94968
>>>>>>> Stashed changes
</footer>
</body>
</html>