M archive/index.html => archive/index.html +14 -19
@@ 10,10 10,10 @@
<body>
<header>
<h1>
- Skyler Writing: Archive
+ Archive Title Here
</h1>
<h2>
- <em><u>A place for old posts.</u></em>
+ <em><u>Archive Subtitle Here</u></em>
<br>
</h2>
</header>
@@ 24,6 24,13 @@
Archived Articles By Publish Date
</h5>
<subsection>
+<li> Archived Article </li>
+<li> Archived Article </li>
+<li> Archived Article </li>
+<li> Archived Article </li>
+<li> Archived Article </li>
+<li> Archived Article </li>
+<li> Archived Article </li>
</subsection>
</bytime>
@@ 33,29 40,17 @@
Information
</h4>
<subsection>
- <h5>Links</h5>
- <li><a href = https://sky.d2evs.net/>Home</a></li>
- <li><a href = https://sky.d2evs.net/archive/>Archive</a></li>
- <li>This blog is hosted on <a href = https://d2evs.net/>d2evs.net</a></li>
- </subsection>
+ Cool stuff
+</subsection>
<subsection>
- <h5>License</h5>
- <p>
- Content on this site is licensed under a <a href =
- "https://en.wikipedia.org/wiki/Creative_Commons_license">CC-BY-NC-ND</a> license. The code
- of this site is licensed under a <a href =
- "https://en.wikipedia.org/wiki/Creative_Commons_license">CC-BY-SA</a>
- license, and complies with <a href =
- https://en.wikipedia.org/wiki/The_Open_Definition> the
- open definition</a>.</p>
- </subsection>
+ More cool stuff
+ </subsection>
</misc>
<article>
- <h2>Archive</h2>
-Welcome to the archive of Skyler Writing. This is the place to find older versions of edited posts or deleted entries.
+ <h2>Content for front page of archive here</h2>
</article>
<footer>
<center>Website designed by Skyler Marks</center>
M index.html => index.html +13 -0
@@ 24,6 24,7 @@
Articles By Publish Date
</h5>
<subsection>
+<<<<<<< HEAD
<li>Article (maybe with a link)</li>
<li>Article (maybe with a link)</li>
<li>Article (maybe with a link)</li>
@@ 36,6 37,9 @@
<li>Article (maybe with a link)</li>
<li>Article (maybe with a link)</li>
<li>Article (maybe with a link)</li>
+=======
+ <li><a href = https://blog.skylermarks.com/>2021-01-30: Home Page Update</a></li>
+>>>>>>> 061091b106021f217b101d37b413dcf453d5f014
</subsection>
</bytime>
@@ 45,8 49,17 @@
Information
</h4>
<subsection>
+<<<<<<< HEAD
<h5> Put some cool stuff here </h5>
</subsection>
+=======
+ <h5>Links</h5>
+ <li><a href = https://blog.skylermarks.com/>Home</a></li>
+ <li><a href = https://blog.skylermarks.com/archive/>Archive</a></li>
+ <li>This blog is hosted on <a href = https://d2evs.net/>d2evs.net</a></li>
+ </subsection>
+
+>>>>>>> 061091b106021f217b101d37b413dcf453d5f014
<subsection>
<h5> Put some cool stuff here </h5>
</subsection>