From c3ff7cd7733be92e76979577c986f87ef94d6f9f Mon Sep 17 00:00:00 2001
From: Flancian <0@flancia.org>
Date: Sun, 20 Feb 2022 14:34:09 +0100
Subject: [PATCH] Auto saved by Logseq

---
 daniel dennett.md     | 5 ++++-
 journal/2022_02_17.md | 4 +---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/daniel dennett.md b/daniel dennett.md
index bede2ffbb..0e920392d 100644
--- a/daniel dennett.md	
+++ b/daniel dennett.md	
@@ -1 +1,4 @@
-- #pull [[dan dennett]]
\ No newline at end of file
+- a [[person]].
+	- [[philosopher]] [[writer]]
+	- #pull [[dan dennett]]
+	- [[friend]] [[douglas hofstadter]]
\ No newline at end of file
diff --git a/journal/2022_02_17.md b/journal/2022_02_17.md
index de2cbc921..db2bb5db7 100644
--- a/journal/2022_02_17.md
+++ b/journal/2022_02_17.md
@@ -1,9 +1,7 @@
-<<<<<<< HEAD
 - #push [[flow]]
 	- "[[struggle]] is the first phase of [[flow]]"
 	- on a meta level I find flow interesting because people I know that wouldn't usually talk about mindfulness or introspection are willing to engage with the concept
 - [[m n]] told me about the [[icnu]] framework for [[procrastination]]
-=======
 - Tough day at [[work]], worked late including an 8pm meeting; after that we did yoga and ate empanadas and I felt better, though :)
 	- Tomorrow I'll work from the office for a change, which will probably feel weird for a bit at least.
 - [[flancia collective]]
@@ -14,4 +12,4 @@
 	- [[will]]
 	- [[jack kausch]]
 	- [[fernando borretti]] == [[zetalyrae]]
->>>>>>> f2694908a06481b54e8023cca1c3303382129ae3
+	  >>>>>>> f2694908a06481b54e8023cca1c3303382129ae3
\ No newline at end of file