Auto saved by Logseq

2024-09-02 11:11:59 +02:00 · 2024-09-02 11:11:59 +02:00 · 07550d6c62
commit 07550d6c62
parent ce0416e0df
1 changed files with 1 additions and 3 deletions
--- a/journals/2024_05_01.md
+++ b/journals/2024_05_01.md
@ -1,6 +1,4 @@
-<<<<<<< HEAD
 - **10:05** [[quick capture]]:  [Figma OSS Alternative](https://news.ycombinator.com/item?id=40218463)
-=======
 - Dotfiles per SwayFX
 	- https://github.com/victor4pinheiro/dotfiles/tree/main
->>>>>>> 3dbf2961f4f9f9838903adedc06d6a247815b23d
+	  >>>>>>> 3dbf2961f4f9f9838903adedc06d6a247815b23d