From 5da48f80d76f4cfb18947c5eef8554687f41e690 Mon Sep 17 00:00:00 2001
From: Flancian <0@flancia.org>
Date: Thu, 4 Jan 2024 14:59:13 +0100
Subject: [PATCH] autopushed

---
 journal/2024-01-03.md | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/journal/2024-01-03.md b/journal/2024-01-03.md
index 1c4a681c9..1247583b7 100644
--- a/journal/2024-01-03.md
+++ b/journal/2024-01-03.md
@@ -1,14 +1,11 @@
-<<<<<<< HEAD
 - All my computers tend to be melting down all the time. They run out of RAM and CPU. It all feels quite un-ecological, but I guess we're all betting on becoming a higher level [[kardashev]]?
   - I'd like to keep [[Flancia sustainable]] though.
     - This led me to [[future studies]].
-=======
 - [[work]]
 - [[fotl]]
 - [[agora development]]
-  - [ ] make it so that [[opensearch]] document is utf-8 so chrome stops ignoring Agora Search (presumably) :)
+  - [x] make it so that [[opensearch]] document is utf-8 so chrome stops ignoring Agora Search (presumably) :)
     - I think the actual issue is that new Chrome only loads [[opensearch]] data when the user performs a search *in the root of the webpage*, e.g. https://anagora.org -- and currently the Agora just redirects to /index so this never happens. Hmm.
       - [ ] Maybe I should just remove that redirect.
 - [[fediverse]]
 - [[yoga with x]]
->>>>>>> c07f5281ee0b4bc07cd7574d8ac32e52bd045d14