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

hurricane helene

Browse Source
This commit is contained in:
Amber
2024-10-04 20:28:54 -04:00
parent e7e105400d
commit a262f567ee
4 changed files with 136 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
news.html
View File

@@ -9,13 +9,48 @@
<body>
<h1>news</h1>
<article>
<<<<<<< Updated upstream
=======
<<<<<<< HEAD
<h1>Hello.</h1>
<p><i>October 4th, 2024</i></p>
<p>You may have noticed that some new text has been added to the hoard pages. My house was completely destroyed
in hurricane Helene. I am still reeling from this, honestly. Consider the hoard page an archive. I don't think
I will be collecting anything again in a long time. I don't trust this area not to destroy everything again.
I'll update the pages with everything I end up with, and I'll add what I had but never uploaded. </p>
<p>Don't worry, me and my family and my cats are all okay.</p>
<p>Also, cohost is officially dead. I used a tool called <a target=”_blank”
href="https://github.com/cpsdqs/cohost-dl" aria-label="opens external site in a new window">cohost-dl</a> to
download an arhive of my cohost page. It's pretty large so we'll see if github pages will allow me to upload
it here. If not, I'll update this paragraph accordingly.</p>
<p>It really sucks that cohost is gone. I'll miss it. I loved it.<p>
<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>
@@ -24,7 +59,9 @@
<p><i>September 10th, 2024</i></p>
<p>Some small updates today. Added a new friend, radmin. Also updated my socials, as I gave up tumblr and cohost is dying. I'm very sad to see it go. I've added my mastadon for the meantime, I've never really had it stick for me but hey, we'll see.</p>
<p>Some small updates today. Added a new friend, radmin. Also updated my socials, as I gave up tumblr and cohost
is dying. I'm very sad to see it go. I've added my mastadon for the meantime, I've never really had it stick for
me but hey, we'll see.</p>
<p>Happy 9/11 tomorrow.</p>
</article>
@@ -128,7 +165,15 @@
<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>