Merge branch 'master' of github.com:flancian/garden

202202.md

@@ -0,0 +1 @@
+- Test for fuzzy month autopulling :)

20220213.md

@@ -0,0 +1 @@
+- Testing [[liberal dates]] :)

green.md

@@ -1,3 +1,7 @@
-- One of my favourite albums.
+- an [[album]].
+	- [[ambient]]
 	- by [[hiroshi yoshimura]]
-	- [[go]] https://open.spotify.com/album/4lj4MVuqt0BXLhL7UsR1Eo?highlight=spotify:track:6RPQdkI8t1eaG2abymrYVK
+	- one of my [[favourites]]
+	- [[spotify]] https://open.spotify.com/album/4lj4MVuqt0BXLhL7UsR1Eo?highlight=spotify:track:6RPQdkI8t1eaG2abymrYVK
+	- [[youtube]] https://music.youtube.com/playlist?list=OLAK5uy_l9fkJDtInJPFN4xEqOqLNDfo-Rw6Qbzyo
+	- [[go]] https://music.youtube.com/playlist?list=OLAK5uy_l9fkJDtInJPFN4xEqOqLNDfo-Rw6Qbzyo

journal/2022_02_13.md

@@ -1,9 +1,6 @@
-<<<<<<< HEAD
 - [[resonate]]
 - [[candles]]
-=======
 - try [[resonate]] today
--
 - [[theruran]]
 	- [[triple bottom line]]
 		- [[fourth bottom line]]
@@ -24,16 +21,18 @@
 	  CLOCK: [2022-02-13 Sun 14:05:01]--[2022-02-13 Sun 14:05:02] =>  00:00:01
 	  :END:
 	- LATER yoga
-	- NOW [[one pomodoro]]
+	- DONE [[one pomodoro]]
 	  :LOGBOOK:
-	  CLOCK: [2022-02-13 Sun 15:01:35]
+	  CLOCK: [2022-02-13 Sun 15:01:35]--[2022-02-13 Sun 18:29:46] =>  03:28:11
 	  :END:
 	- DONE meditate
 	  :LOGBOOK:
 	  CLOCK: [2022-02-13 Sun 15:01:40]--[2022-02-13 Sun 15:01:40] =>  00:00:00
 	  :END:
-	- LATER [[one pomodoro]]
+	- NOW [[one pomodoro]]
 	  :LOGBOOK:
 	  CLOCK: [2022-02-13 Sun 15:01:43]--[2022-02-13 Sun 15:09:30] =>  00:07:47
 	  :END:
->>>>>>> 83ed680f1159a3da140dc3ce2aeb4e5464f7b951
+	  CLOCK: [2022-02-13 Sun 18:29:49]
+	  :END:
+- [[green]]

logseq/bak/20220213.md.2022-02-13T18_00_08.675Z

@@ -0,0 +1 @@
+Testing 'squashed' dates :)