diff --git a/public/assets/pet-calendar-2026-cover.png b/public/assets/pet-calendar-2026-cover.png new file mode 100644 index 0000000..bbc3e3f Binary files /dev/null and b/public/assets/pet-calendar-2026-cover.png differ diff --git a/src/pages/projects.astro b/src/pages/projects.astro index 33c2431..f5d7387 100644 --- a/src/pages/projects.astro +++ b/src/pages/projects.astro @@ -109,9 +109,19 @@ import "../styles/globals.css"; class="underline decoration-solid">Pihole Workshop +
+ photo collage of cats + Pet Calendar +
diff --git a/src/pages/projects/PetCalendar.astro b/src/pages/projects/PetCalendar.astro index a466ff8..ed1e685 100644 --- a/src/pages/projects/PetCalendar.astro +++ b/src/pages/projects/PetCalendar.astro @@ -10,6 +10,7 @@ import "../../styles/globals.css";
+<<<<<<< HEAD

Pet Calendar

We created a pet calendar with 12 beautiful pictures of RTM's animal friends. @@ -331,6 +332,27 @@ import "../../styles/globals.css";

+======= +

Pet Calendar

+

Welcome to the pet calendar! +

+
+
+

January

+
+

Difficulty rating: 🌶️🌶️🌶️/5 +

+
+ Tutorial on Linux! + +

+ + + +>>>>>>> 11c810c (Create pet calendar page)
diff --git a/src/pages/projects/bookclub.astro b/src/pages/projects/bookclub.astro index 23edeaa..3f857c3 100644 --- a/src/pages/projects/bookclub.astro +++ b/src/pages/projects/bookclub.astro @@ -23,7 +23,11 @@ import "../../styles/globals.css";

Current Book

- Holding Change - adrienne maree brown + Race After Technology - Ruha Benjamin (see discussion guide + )