mirror of
https://github.com/flancian/garden.git
synced 2026-08-07 23:16:21 +00:00
Default commit message, part of an automated flow.
This commit is contained in:
+10
-8
@@ -1,12 +1,5 @@
|
|||||||
# 2021-12-30
|
# 2021-12-30
|
||||||
|
|
||||||
<<<<<<< HEAD
|
|
||||||
- [[commons]]
|
|
||||||
- [[knowledge commons]]
|
|
||||||
- [[digital commons]]
|
|
||||||
- [[markets]]
|
|
||||||
- [[singularity]]
|
|
||||||
=======
|
|
||||||
- [[zk]]
|
- [[zk]]
|
||||||
- [x] [[work]]
|
- [x] [[work]]
|
||||||
- [x] [[flancia]]
|
- [x] [[flancia]]
|
||||||
@@ -19,4 +12,13 @@
|
|||||||
- [[push]] [[barón biza]]
|
- [[push]] [[barón biza]]
|
||||||
- [[jorge barón biza]]
|
- [[jorge barón biza]]
|
||||||
- born [[1942]]
|
- born [[1942]]
|
||||||
>>>>>>> a2f48d2b0f74973792b225f33a3793a84fc11440
|
- [[commons]]
|
||||||
|
- [[knowledge commons]]
|
||||||
|
- [[digital commons]]
|
||||||
|
- [[markets]]
|
||||||
|
- [[push]] [[singularity]]
|
||||||
|
- got reminded of the [[singularity church]] in [[deus ex]]
|
||||||
|
- turns out there is a [[church of the singularity]]
|
||||||
|
- also:
|
||||||
|
- [[church of the simulation]]
|
||||||
|
- [[church of earth]]
|
||||||
|
|||||||
@@ -6,3 +6,4 @@
|
|||||||
- [[pull]] [[david deutsch]] [[max tegmark]] [[nick bostrom]] [[dust universe theory]]
|
- [[pull]] [[david deutsch]] [[max tegmark]] [[nick bostrom]] [[dust universe theory]]
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user