Merge, merge, merge! As we fork we'll merge!

This commit is contained in:
2024-08-07 00:26:08 +02:00
parent e68ec5af2b
commit 527809f10e
+1 -4
View File
@@ -1,4 +1,3 @@
<<<<<<< HEAD
- [[agora development]]:
- Fix some quirks?
- Take e.g. [[2024-07-20]]:
@@ -10,7 +9,6 @@
- Take e.g. [[zine]]
- [ ] It should transclude the whole of [[agua para los sedientos]], meaning the push should work.
- I intend to make it to [[Flancia Meet]] around 10AM UTC today.
=======
- [[zine]]
- [[agora]]
- I thought about 7:
@@ -26,6 +24,5 @@
- I read about [[Thalassemia]]
- [[Bryce Huebner]]
- [[LM Studio]]
- [[skreutzer]]
- [[skreutzer]]
- [[sensecraft]]
>>>>>>> c88129cac9b3765c737d5617b7b3b9a95256283b