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

This commit is contained in:
2021-05-28 18:50:13 +02:00
3 changed files with 56 additions and 66 deletions
+52 -62
View File
@@ -8,28 +8,27 @@
"type": "split",
"children": [
{
"id": "90ec1eb033ec1a7c",
"id": "b21fd05bcd29c05d",
"type": "split",
"dimension": 36.90851735015773,
"children": [
{
"id": "ae59c49b3be42d7f",
"id": "bbea07cc3c584323",
"type": "leaf",
"state": {
"type": "markdown",
"state": {
"file": "governing the commons.md",
"file": "2021-05-26.md",
"mode": "source"
}
}
},
{
"id": "0444216a0f31d5d1",
"id": "e8c7d7d57721e66d",
"type": "leaf",
"state": {
"type": "markdown",
"state": {
"file": "understanding knowledge as a commons.md",
"file": "2021-05-26.md",
"mode": "source"
}
}
@@ -38,12 +37,22 @@
"direction": "vertical"
},
{
"id": "ecc917675c91e32d",
"id": "7f4febbb4b6a9e6d",
"type": "leaf",
"state": {
"type": "markdown",
"state": {
"file": "flancia collective.md",
"mode": "source"
}
}
},
{
"id": "68e81b5f03f48b15",
"type": "split",
"dimension": 31.54574132492114,
"children": [
{
"id": "efc285d04f618479",
"id": "b2d0be3b2866e3eb",
"type": "leaf",
"state": {
"type": "markdown",
@@ -54,12 +63,23 @@
}
},
{
"id": "ec6cb93f833f0a75",
"id": "f0e9fd78e296d26f",
"type": "leaf",
"state": {
"type": "markdown",
"state": {
"file": "obsidian plugins.md",
"file": "patterns.md",
"mode": "source"
}
}
},
{
"id": "7079d00b3a2eb6be",
"type": "leaf",
"state": {
"type": "markdown",
"state": {
"file": "tooty.md",
"mode": "source"
}
}
@@ -68,28 +88,27 @@
"direction": "vertical"
},
{
"id": "089feb5db4c29e31",
"id": "48e5a96610f666cb",
"type": "split",
"dimension": 31.54574132492114,
"children": [
{
"id": "d751188de77a3616",
"id": "07bb2929b930eb3c",
"type": "leaf",
"state": {
"type": "markdown",
"state": {
"file": "trailmarks.md",
"file": "pattern chosen.md",
"mode": "source"
}
}
},
{
"id": "172d4c60007a6d72",
"id": "5d3728e0db1b9a7a",
"type": "leaf",
"state": {
"type": "markdown",
"state": {
"file": "blaine.md",
"file": "patterns.md",
"mode": "source"
}
}
@@ -125,12 +144,12 @@
"state": {
"type": "search",
"state": {
"query": "arcosanti",
"query": "",
"matchingCase": false,
"explainSearch": false,
"collapseAll": false,
"extraContext": false,
"sortOrder": "byModifiedTime"
"sortOrder": "alphabetical"
}
}
},
@@ -141,16 +160,9 @@
"type": "starred",
"state": {}
}
},
{
"id": "aa0f3e910050164c",
"type": "leaf",
"state": {
"type": "recent-files",
"state": {}
}
}
]
],
"currentTab": 1
}
],
"direction": "horizontal",
@@ -170,7 +182,7 @@
"state": {
"type": "backlink",
"state": {
"file": "blaine.md",
"file": "patterns.md",
"collapseAll": false,
"extraContext": false,
"sortOrder": "alphabetical",
@@ -187,31 +199,9 @@
"state": {
"type": "outline",
"state": {
"file": "blaine.md"
"file": "patterns.md"
}
}
},
{
"id": "eaa7f99b4cf5444a",
"type": "leaf",
"state": {
"type": "online.larslockefeer.obsidian-plugin-todo",
"state": {}
}
}
]
},
{
"id": "9852b3b70c9ace3c",
"type": "tabs",
"children": [
{
"id": "ba82168a0acbacba",
"type": "leaf",
"state": {
"type": "todo",
"state": {}
}
}
]
}
@@ -220,17 +210,17 @@
"width": 300,
"collapsed": true
},
"active": "172d4c60007a6d72",
"active": "f0e9fd78e296d26f",
"lastOpenFiles": [
"blaine.md",
"patterns.md",
"2021-05-28.md",
"kenzo tange.md",
"atjson.md",
"2021-05-23.md",
"frenemy.md",
"governing the commons.md",
"2021-05-24.md",
"gardens yaml.md",
"switzerland.md"
"2021-05-27.md",
"flancia collective.md",
"reading alexander.md",
"tooty.md",
"agora editor.md",
"gardens.yaml.md",
"patterning.md",
"pattern chosen.md"
]
}
+2 -1
View File
@@ -3,4 +3,5 @@
- [[agora]]
- [[vera]]
- [[git submodules]] might be making a comeback :)
- [[a pattern language]]
- [[a pattern language]]
- [[patterns]]
+2 -3
View File
@@ -3,8 +3,7 @@
- a [[list]].
- [[push]] here to add an item to this list.
- [[pull]] [[pattern]]
- [[a pattern language]]
- [[1]] [[independent regions]]
- [[the countryside]]
- [[apl 1]] [[independent regions]]
- [[apl 2]] [[the countryside]]
- [[carnival]]
- [[filtered light]]