flancian/garden
0
0
Fork 0
mirror of https://github.com/flancian/garden.git synced 2026-08-07 23:16:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Flancian
2024-08-07 00:26:08 +02:00
parent e68ec5af2b
commit 527809f10e
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
journal/2024-07-20.md
-3
View File
@@ -1,4 +1,3 @@
<<<<<<< HEAD
- [[agora development]]: - [[agora development]]:
- Fix some quirks? - Fix some quirks?
- Take e.g. [[2024-07-20]]: - Take e.g. [[2024-07-20]]:
@@ -10,7 +9,6 @@
- Take e.g. [[zine]] - Take e.g. [[zine]]
- [ ] It should transclude the whole of [[agua para los sedientos]], meaning the push should work. - [ ] 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. - I intend to make it to [[Flancia Meet]] around 10AM UTC today.
=======
- [[zine]] - [[zine]]
- [[agora]] - [[agora]]
- I thought about 7: - I thought about 7:
@@ -28,4 +26,3 @@
- [[LM Studio]] - [[LM Studio]]
- [[skreutzer]] - [[skreutzer]]
- [[sensecraft]] - [[sensecraft]]
>>>>>>> c88129cac9b3765c737d5617b7b3b9a95256283b