diff --git a/journal/2021-10-01.md b/journal/2021-10-01.md index ce96c07fd..a985a5972 100644 --- a/journal/2021-10-01.md +++ b/journal/2021-10-01.md @@ -1,3 +1,8 @@ # 2021-10-01 -- [[october 2021]] \ No newline at end of file +<<<<<<< HEAD +- [[october]] + - [[october 2021]] +======= +- [[october 2021]] +>>>>>>> 4262580707738a0b1b67413accc70af7b038a91c diff --git a/october 2021.md b/october 2021.md index 58dc9917f..c5e4151a8 100644 --- a/october 2021.md +++ b/october 2021.md @@ -1,9 +1,9 @@ # october 2021 +- [[push]] [[october]] - a [[month]] - In October we'll flow - [[flowctober]] (?) - - [[yoga calendar]] https://s3.amazonaws.com/kajabi-storefronts-production/sites/40265/themes/2380946/downloads/EuSh8nzHQZG3llvcXXdd_October_2021_yoga_calendar_-_YWA_version.pdf - [[priorities]] - [[agora]] - [[agora bridge]] @@ -14,5 +14,6 @@ - [[flancia]] - [[write]] - [[an open letter to the agora]] - + - [[yoga]] https://s3.amazonaws.com/kajabi-storefronts-production/sites/40265/themes/2380946/downloads/EuSh8nzHQZG3llvcXXdd_October_2021_yoga_calendar_-_YWA_version.pdf + - [[go]] [[yoga with adriene]]