From 26eb6ee43608ca99f0bfcf5d875b99fbb1091585 Mon Sep 17 00:00:00 2001
From: David <david.griffiths@dgware.com.au>
Date: Mon, 29 Dec 2025 19:33:48 +1100
Subject: [PATCH] [nb] Edit: 20251229.md

---
 20251229.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/20251229.md b/20251229.md
index 38ea101..5001976 100644
--- a/20251229.md
+++ b/20251229.md
@@ -90,6 +90,7 @@ dinner ham with coleslaw
 
 drink campari and soda
 
+<<<<<<< HEAD
 ## 21:05:27
 
 snack cherries
@@ -97,3 +98,8 @@ snack cherries
 ## 21:05:48
 
 drink campari and soda
+=======
+## 19:33:48
+
+n1
+>>>>>>> c57f2aa ([nb] Edit: 20251229.md)