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

cryptopunks.md

@@ -0,0 +1,6 @@
+# cryptopunks
+
+- a [[project]]
+  - [[nfts]] [[2016]]
+  - [[go]] https://www.larvalabs.com/cryptopunks
+

journal/2021-11-23.md

@@ -1,6 +1,11 @@
 # 2021-11-23
 
+<<<<<<< HEAD
 - [[think tank]]
   - [[mondegreen]] [[think thank]]
 - [[roko]]
-- [[evan]] posted nice questions I want to answer today: https://twitter.com/Scaledish/status/1462940124141047808
+- [[evan]] posted nice questions I want to answer today: https://twitter.com/Scaledish/status/1462940124141047808
+=======
+- [[olof]] recommended [[the bureau]] ([[french]], [[2015]])
+  - [[birthday]] today!
+>>>>>>> 1001f897e1d807404718908e4dd593b19dc36060

journal/2021-11-24.md

@@ -1,4 +1,5 @@
 # 2021-11-24
 
 - [[vera]]
-  - [[medito]]
+  - [[medito]]
+- TIL about [[cryptopunks]] and for some reason it depressed me a bit.