From 1d761630b117ad02f5e5e9ba26f5f942d6c4d6d2 Mon Sep 17 00:00:00 2001
From: rdrew <rdrew@upei.ca>
Date: Thu, 14 May 2026 11:47:07 -0300
Subject: [PATCH] [nb] Reconcile Index

---
 .index | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.index b/.index
index de65435..f00ffbe 100644
--- a/.index
+++ b/.index
@@ -27,9 +27,9 @@ past_ssh.md
 bookmarks
 video_watch_list.md
 vcr_dvd_purchase.md
-<<<<<<< HEAD
+
 linux_recording.md
 20260416160225.md
-=======
+
 d11_theme_reqirements.md
->>>>>>> 9ae0555defb14e20bfa54f8d040484e9a462809b
+