From 49957aa0369908d2f2f699210ebd1719b15c0cf9 Mon Sep 17 00:00:00 2001 From: hobokenchicken Date: Thu, 9 Apr 2026 15:34:55 -0400 Subject: [PATCH] Resolve merge conflicts in posts/index.html and categories/index.html - Keep Jekyll template versions for dynamic pagination - Remove static HTML versions that were generated - Ensure consistent use of Jekyll pagination and categories --- categories/index.html | 130 ------------------------------------------ posts/index.html | 124 ---------------------------------------- 2 files changed, 254 deletions(-) diff --git a/categories/index.html b/categories/index.html index 7365a89..4a13588 100644 --- a/categories/index.html +++ b/categories/index.html @@ -1,131 +1,3 @@ -<<<<<<< HEAD - - - - - - - -d@n tech Categories | d@n tech - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-
-

d@n tech

-
-
Caffinated Tech Insights
-
- -
-
- -
- -
-
-

Post Categories

- -

news

- - 2025-04-09 >> brewing success: my journey into freelance web development and server upgrades - - 2023-12-27 >> d@n tech is Live! - -
-

See all posts in news (2) >>

-
- -

life

- - 2025-02-28 >> coffee, code, and creativity: the launch of my new website - - 2025-02-27 >> from beans to bills: crafting my first project quote - - 2025-01-30 >> brewed reflections: a semester wrap-up and steaming future ahead - -
-

See all posts in life (7) >>

-
- -

tech

- - 2025-06-18 >> brewing up my homelab: new services, hardware, and monitoring magic - - 2025-02-19 >> percolating ideas: my web dev adventure - - 2024-07-09 >> when the coffee gets cold: recent adventures in my tech homelab - -
-

See all posts in tech (6) >>

-
- - - -
-
-
- - - - -======= --- layout: default title: d@n tech Categories @@ -141,5 +13,3 @@ title: d@n tech Categories

See all posts in {{category | first}} ({{category[1] | size}}) >>

{% endfor %} - ->>>>>>> 510ad35b2b74a95bd47077bc579d64b4505fa281 diff --git a/posts/index.html b/posts/index.html index e2dc151..5441ccd 100644 --- a/posts/index.html +++ b/posts/index.html @@ -1,126 +1,3 @@ -<<<<<<< HEAD - - - - - - - -d@n tech posts | d@n tech - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-
-

d@n tech

-
-
Caffinated Tech Insights
-
- -
-
- -
- -
-
-

Posts

- - 2025-12-01 >> the barista's new toolstech - - 2025-06-18 >> brewing up my homelab: new services, hardware, and monitoring magictech - - 2025-04-09 >> brewing success: my journey into freelance web development and server upgradesnews - - 2025-02-28 >> coffee, code, and creativity: the launch of my new websitelife - - 2025-02-27 >> from beans to bills: crafting my first project quotelife - - 2025-02-19 >> percolating ideas: my web dev adventuretech - - 2025-01-30 >> brewed reflections: a semester wrap-up and steaming future aheadlife - - 2024-11-27 >> a roast of reality: life changes, career shifts, and what's nextlife - - 2024-07-09 >> when the coffee gets cold: recent adventures in my tech homelabtech - - 2024-03-27 >> brewing resilience: from lxc to vm for flawless plex and beyondtech - - -
- - -<- Older - - - -
- -
-
-
- - - - -======= --- layout: default title: d@n tech posts @@ -143,4 +20,3 @@ pagination: {% endif %} {% endif %} ->>>>>>> 510ad35b2b74a95bd47077bc579d64b4505fa281