From 3d66ebc0918f9c11ad528f887ddca56605df36dc Mon Sep 17 00:00:00 2001
From: Flancian <0@flancia.org>
Date: Fri, 10 Dec 2021 20:07:41 +0100
Subject: [PATCH 01/18] Autopush.

---
 journal/2021-12-04.md | 1 +
 journal/2021-12-10.md | 3 +++
 2 files changed, 4 insertions(+)
 create mode 100644 journal/2021-12-10.md

diff --git a/journal/2021-12-04.md b/journal/2021-12-04.md
index 4503100ec..a3e0e4718 100644
--- a/journal/2021-12-04.md
+++ b/journal/2021-12-04.md
@@ -30,3 +30,4 @@
 - [[flancian]] == [[eduardo]]
   - [[good is the intent to correct errors]]
   - [[flancia collective]]
+- [[solve poverty]]
diff --git a/journal/2021-12-10.md b/journal/2021-12-10.md
new file mode 100644
index 000000000..12491c87b
--- /dev/null
+++ b/journal/2021-12-10.md
@@ -0,0 +1,3 @@
+# 2021-12-10
+
+- [[solve poverty]]
\ No newline at end of file

From 78d34fc25ca101aa26ee12eecda5b7ffb4613d8f Mon Sep 17 00:00:00 2001
From: Flancian <0@flancia.org>
Date: Fri, 10 Dec 2021 20:08:10 +0100
Subject: [PATCH 02/18] Autopush.

---
 solve poverty.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 solve poverty.md

diff --git a/solve poverty.md b/solve poverty.md
new file mode 100644
index 000000000..101bd3ee3
--- /dev/null
+++ b/solve poverty.md	
@@ -0,0 +1,5 @@
+# solve poverty
+
+- a [[solution]].
+  - [[solve]] [[poverty]]
+

From c878a5e745d99979864a6cc8b9187944ac32005b Mon Sep 17 00:00:00 2001
From: Flancian <0@flancia.org>
Date: Fri, 10 Dec 2021 20:08:16 +0100
Subject: [PATCH 03/18] Autopush.

---
 solve poverty.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/solve poverty.md b/solve poverty.md
index 101bd3ee3..c324d86ea 100644
--- a/solve poverty.md	
+++ b/solve poverty.md	
@@ -1,5 +1,5 @@
 # solve poverty
 
-- a [[solution]].
+- a [[program]].
   - [[solve]] [[poverty]]
 

From 4ddb94ab226f696a35d12fb3608c0b55e98c39ec Mon Sep 17 00:00:00 2001
From: Flancian <0@flancia.org>
Date: Fri, 10 Dec 2021 20:08:43 +0100
Subject: [PATCH 04/18] Autopush.

---
 program.md | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 program.md

diff --git a/program.md b/program.md
new file mode 100644
index 000000000..ac5cfeb78
--- /dev/null
+++ b/program.md
@@ -0,0 +1,4 @@
+# program
+
+- a [[program]] is a [[composition]] of [[patterns]] and [[data structures]].
+

From c7081dcb142e869e11debbef43817abb205fcce5 Mon Sep 17 00:00:00 2001
From: Flancian <0@flancia.org>
Date: Fri, 10 Dec 2021 20:09:01 +0100
Subject: [PATCH 05/18] Autopush.

---
 program.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/program.md b/program.md
index ac5cfeb78..45ff85197 100644
--- a/program.md
+++ b/program.md
@@ -1,4 +1,5 @@
 # program
 
 - a [[program]] is a [[composition]] of [[patterns]] and [[data structures]].
+  - a [[program]] is a [[composition]] of [[patterns]].
 

From 4f9dec107f0994d92ce44af45da2427f13f505c4 Mon Sep 17 00:00:00 2001
From: Flancian <0@flancia.org>
Date: Fri, 10 Dec 2021 20:09:21 +0100
Subject: [PATCH 06/18] Autopush.

---
 program.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/program.md b/program.md
index 45ff85197..71530a72b 100644
--- a/program.md
+++ b/program.md
@@ -1,5 +1,5 @@
 # program
 
 - a [[program]] is a [[composition]] of [[patterns]] and [[data structures]].
-  - a [[program]] is a [[composition]] of [[patterns]].
+  - a [[program]] is a [[composition]] of [[patterns]] that generates states over time.
 

From 65bd9d374337209befd5b9df71acbd7a1c5ef24f Mon Sep 17 00:00:00 2001
From: Flancian <0@flancia.org>
Date: Fri, 10 Dec 2021 20:14:13 +0100
Subject: [PATCH 07/18] Autopush.

---
 solve poverty.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/solve poverty.md b/solve poverty.md
index c324d86ea..8be7fb9fe 100644
--- a/solve poverty.md	
+++ b/solve poverty.md	
@@ -2,4 +2,6 @@
 
 - a [[program]].
   - [[solve]] [[poverty]]
+  - [[S0]] define [[poverty]]
+  - [[S1]] estimate the [[resources]] needed to solve it.
 

From c2ea6cd8eaf260957a05944a3f802cd7471ae8ab Mon Sep 17 00:00:00 2001
From: Flancian <0@flancia.org>
Date: Fri, 10 Dec 2021 20:19:05 +0100
Subject: [PATCH 08/18] Autopush.

---
 solve poverty.md | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/solve poverty.md b/solve poverty.md
index 8be7fb9fe..c6a0249ef 100644
--- a/solve poverty.md	
+++ b/solve poverty.md	
@@ -3,5 +3,7 @@
 - a [[program]].
   - [[solve]] [[poverty]]
   - [[S0]] define [[poverty]]
-  - [[S1]] estimate the [[resources]] needed to solve it.
-
+  - [[S1]] [[generic]] estimate the [[resources]] needed to solve it, including implementation plans of subproblems (dependencies).
+    - [[S1.1]] model the [[dependencies]] in a [[dag]].
+  - [[S2]] [[generic]] crowdsource a [[minimum spanning tree]] representing a viable solution
+  - [[S3]] implement [[incremental]] [[basic income]] leading to [[universal]]

From eb75b79f764774e489eae4fdf7196387d14e6f36 Mon Sep 17 00:00:00 2001
From: Flancian <0@flancia.org>
Date: Fri, 10 Dec 2021 20:19:37 +0100
Subject: [PATCH 09/18] Autopush.

---
 solve poverty.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/solve poverty.md b/solve poverty.md
index c6a0249ef..685794c8e 100644
--- a/solve poverty.md	
+++ b/solve poverty.md	
@@ -6,4 +6,4 @@
   - [[S1]] [[generic]] estimate the [[resources]] needed to solve it, including implementation plans of subproblems (dependencies).
     - [[S1.1]] model the [[dependencies]] in a [[dag]].
   - [[S2]] [[generic]] crowdsource a [[minimum spanning tree]] representing a viable solution
-  - [[S3]] implement [[incremental]] [[basic income]] leading to [[universal]]
+  - [[S3]] [[incremental]] [[basic income]] -> [[universal basic income]]

From 7009f137424ebc67318c4c7b8ff3afb603fd3487 Mon Sep 17 00:00:00 2001
From: Flancian <0@flancia.org>
Date: Fri, 10 Dec 2021 20:22:36 +0100
Subject: [PATCH 10/18] Autopush.

---
 basic income.md | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/basic income.md b/basic income.md
index db09ae4da..b69ba19f6 100644
--- a/basic income.md	
+++ b/basic income.md	
@@ -1,6 +1,9 @@
 # Basic Income
 
-- Mostly the same as [[universal basic income]] in common use, but potentially less universal :)
-- [[pull]] [[universal basic income]]
+- A [[subset]].
+  - Of [[universal basic income]]. 
+    - [[pull]] [[universal basic income]]
+  - Some of us get the support to stay above [[poverty]]; some of us don't.
+  - It doesn't matter that much to me if it's the state giving you a [[guaranteed income]] or another party; friend, community or family often fulfill the same role.
 
 

From d59126cb917e4b159cc660ffe2a1285e1a12a79e Mon Sep 17 00:00:00 2001
From: Flancian <0@flancia.org>
Date: Fri, 10 Dec 2021 20:23:26 +0100
Subject: [PATCH 11/18] Autopush.

---
 basic income.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/basic income.md b/basic income.md
index b69ba19f6..c184dbe86 100644
--- a/basic income.md	
+++ b/basic income.md	
@@ -4,6 +4,7 @@
   - Of [[universal basic income]]. 
     - [[pull]] [[universal basic income]]
   - Some of us get the support to stay above [[poverty]]; some of us don't.
-  - It doesn't matter that much to me if it's the state giving you a [[guaranteed income]] or another party; friend, community or family often fulfill the same role.
-
+    - It doesn't matter that much to me if it's the state giving you a [[guaranteed income]] or another party; friend, community or family often fulfill the same role.
+    - In [[Flancia]] they solved [[poverty]] through [[incremental basic income]].
+      - [[the expanding circle]] -> [[universal basic income]]
 

From 5042a488b3bbd84fc011c2fad8ee7345806a85ff Mon Sep 17 00:00:00 2001
From: Flancian <0@flancia.org>
Date: Fri, 10 Dec 2021 20:23:50 +0100
Subject: [PATCH 12/18] Autopush.

---
 incremental basic income.md | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 incremental basic income.md

diff --git a/incremental basic income.md b/incremental basic income.md
new file mode 100644
index 000000000..afa9a12f4
--- /dev/null
+++ b/incremental basic income.md	
@@ -0,0 +1,3 @@
+# incremental basic income
+
+- [[pull]] [[incremental basic income]]

From 5096dcf46a5bc795bc443d043a5f49b01186eec3 Mon Sep 17 00:00:00 2001
From: Flancian <0@flancia.org>
Date: Fri, 10 Dec 2021 20:26:57 +0100
Subject: [PATCH 13/18] Autopush.

---
 incremental basic income.md | 2 +-
 incremental.md              | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)
 create mode 100644 incremental.md

diff --git a/incremental basic income.md b/incremental basic income.md
index afa9a12f4..22f0ac391 100644
--- a/incremental basic income.md	
+++ b/incremental basic income.md	
@@ -1,3 +1,3 @@
 # incremental basic income
 
-- [[pull]] [[incremental basic income]]
+- [[pull]] [[incremental]] [[basic income]]
diff --git a/incremental.md b/incremental.md
new file mode 100644
index 000000000..cecade18f
--- /dev/null
+++ b/incremental.md
@@ -0,0 +1,2 @@
+# incremental
+

From b32d6661e0fd8d52d5ce70dd4c25ac83eedb3ffc Mon Sep 17 00:00:00 2001
From: Flancian <0@flancia.org>
Date: Fri, 10 Dec 2021 20:27:12 +0100
Subject: [PATCH 14/18] Autopush.

---
 incremental.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/incremental.md b/incremental.md
index cecade18f..fe0d8f599 100644
--- a/incremental.md
+++ b/incremental.md
@@ -1,2 +1,4 @@
 # incremental
 
+- [[pull]] [[protopoi]] [[flancia]] 
+

From adb4197162d8eea97ac521c5c90d5af95258fad7 Mon Sep 17 00:00:00 2001
From: Flancian <0@flancia.org>
Date: Fri, 10 Dec 2021 20:32:33 +0100
Subject: [PATCH 15/18] Autopush.

---
 unigraph.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/unigraph.md b/unigraph.md
index ec511ec11..addc6423e 100644
--- a/unigraph.md
+++ b/unigraph.md
@@ -1,3 +1,4 @@
+
 - a [[tool]]
 	- [[graph database]] [[knowledge engine]]
 	- by [[sophia xu]]

From 68a51880e2e9f465c73fcd063b317a2a69d404db Mon Sep 17 00:00:00 2001
From: Flancian <0@flancia.org>
Date: Fri, 10 Dec 2021 20:33:05 +0100
Subject: [PATCH 16/18] Autopush.

---
 journal/2021-12-10.md | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/journal/2021-12-10.md b/journal/2021-12-10.md
index 2b748d8b4..2fa603921 100644
--- a/journal/2021-12-10.md
+++ b/journal/2021-12-10.md
@@ -1,7 +1,5 @@
 # 2021-12-10
 
-<<<<<<< HEAD
-- [[solve poverty]]
-=======
 - [[sophia xu]]
->>>>>>> e21e88c7603ba05258677ff3894a98fa930c6b52
+- [[the shape of my heart]]
+- [[solve poverty]]

From 8f67d28ffae944a2813c7dbffc39aa3e505d212b Mon Sep 17 00:00:00 2001
From: Flancian <0@flancia.org>
Date: Fri, 10 Dec 2021 20:34:20 +0100
Subject: [PATCH 17/18] Autopush.

---
 gate gate paragate parasamgate bodhi svaha.md | 4 ++++
 heart sutra.md                                | 4 ++++
 heart.md                                      | 3 +++
 the shape of my heart.md                      | 7 +++++++
 4 files changed, 18 insertions(+)
 create mode 100644 gate gate paragate parasamgate bodhi svaha.md
 create mode 100644 heart sutra.md
 create mode 100644 heart.md
 create mode 100644 the shape of my heart.md

diff --git a/gate gate paragate parasamgate bodhi svaha.md b/gate gate paragate parasamgate bodhi svaha.md
new file mode 100644
index 000000000..6b90422fa
--- /dev/null
+++ b/gate gate paragate parasamgate bodhi svaha.md	
@@ -0,0 +1,4 @@
+# gate gate paragate parasamgate bodhi svaha
+
+- I think this often.
+
diff --git a/heart sutra.md b/heart sutra.md
new file mode 100644
index 000000000..8a67cb4af
--- /dev/null
+++ b/heart sutra.md	
@@ -0,0 +1,4 @@
+# heart sutra
+
+- [[gate gate paragate parasamgate bodhi svaha]]
+
diff --git a/heart.md b/heart.md
new file mode 100644
index 000000000..4f77c7f88
--- /dev/null
+++ b/heart.md
@@ -0,0 +1,3 @@
+# heart
+
+- when I think of the [[heart]], I think of the [[heart sutra]].
\ No newline at end of file
diff --git a/the shape of my heart.md b/the shape of my heart.md
new file mode 100644
index 000000000..ab7a8e712
--- /dev/null
+++ b/the shape of my heart.md	
@@ -0,0 +1,7 @@
+# the shape of my heart
+
+- a [[song]].
+  - by [[sting]].
+  - a bit corny perhaps? but I think I like it still.
+- [[pull]] [[heart]]
+

From 91aaad46f8fd33339609371ff9a27c82a6ed9a12 Mon Sep 17 00:00:00 2001
From: Flancian <0@flancia.org>
Date: Fri, 10 Dec 2021 22:22:33 +0100
Subject: [PATCH 18/18] Autopush.

---
 journal/2021-12-10.md | 2 ++
 the second coming.md  | 5 +++++
 2 files changed, 7 insertions(+)
 create mode 100644 the second coming.md

diff --git a/journal/2021-12-10.md b/journal/2021-12-10.md
index 2fa603921..ddc6fb722 100644
--- a/journal/2021-12-10.md
+++ b/journal/2021-12-10.md
@@ -3,3 +3,5 @@
 - [[sophia xu]]
 - [[the shape of my heart]]
 - [[solve poverty]]
+- [[william butler yeats]]
+  - [[the second coming]]
diff --git a/the second coming.md b/the second coming.md
new file mode 100644
index 000000000..dbd113a16
--- /dev/null
+++ b/the second coming.md	
@@ -0,0 +1,5 @@
+# the second coming
+
+- a [[poem]].
+  - [[go]] https://www.poetryfoundation.org/poems/43290/the-second-coming
+