mirror of
https://github.com/flancian/garden.git
synced 2026-08-07 23:16:21 +00:00
[[snapshot]]: 2021-05-28 10:40:04
Affected files: .obsidian/workspace 2021-05-28.md conflict-files-obsidian-git.md
This commit is contained in:
Vendored
+7
-7
@@ -96,7 +96,7 @@
|
|||||||
"state": {
|
"state": {
|
||||||
"type": "markdown",
|
"type": "markdown",
|
||||||
"state": {
|
"state": {
|
||||||
"file": "frenemy.md",
|
"file": "2021-05-28.md",
|
||||||
"mode": "source"
|
"mode": "source"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -280,7 +280,7 @@
|
|||||||
"state": {
|
"state": {
|
||||||
"type": "backlink",
|
"type": "backlink",
|
||||||
"state": {
|
"state": {
|
||||||
"file": "subtext.md",
|
"file": "2021-05-28.md",
|
||||||
"collapseAll": false,
|
"collapseAll": false,
|
||||||
"extraContext": false,
|
"extraContext": false,
|
||||||
"sortOrder": "alphabetical",
|
"sortOrder": "alphabetical",
|
||||||
@@ -297,7 +297,7 @@
|
|||||||
"state": {
|
"state": {
|
||||||
"type": "outline",
|
"type": "outline",
|
||||||
"state": {
|
"state": {
|
||||||
"file": "subtext.md"
|
"file": "2021-05-28.md"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -330,17 +330,17 @@
|
|||||||
"width": 300,
|
"width": 300,
|
||||||
"collapsed": true
|
"collapsed": true
|
||||||
},
|
},
|
||||||
"active": "81312818f4299cce",
|
"active": "337a1c686e22dffb",
|
||||||
"lastOpenFiles": [
|
"lastOpenFiles": [
|
||||||
"subtext.md",
|
|
||||||
"2021-05-28.md",
|
"2021-05-28.md",
|
||||||
|
"frenemy.md",
|
||||||
|
"subtext.md",
|
||||||
"⚒.md",
|
"⚒.md",
|
||||||
"tools for thought interchange.md",
|
"tools for thought interchange.md",
|
||||||
"knowledge garden overview.md",
|
"knowledge garden overview.md",
|
||||||
"2021-05-27.md",
|
"2021-05-27.md",
|
||||||
"governing the commons.md",
|
"governing the commons.md",
|
||||||
"webminar mode.md",
|
"webminar mode.md",
|
||||||
"young wizards.md",
|
"young wizards.md"
|
||||||
"conflict-files-obsidian-git.md"
|
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
+4
-1
@@ -1 +1,4 @@
|
|||||||
- [[subtext]]
|
- [[subtext]]
|
||||||
|
- [[agora]]
|
||||||
|
- [[vera]]
|
||||||
|
- [[git submodules]] might be making a comeback :)
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
# Conflict files
|
|
||||||
Please resolve them and commit per command (This file will be deleted before the commit).
|
|
||||||
- Not a file: .obsidian/workspace
|
|
||||||
Reference in New Issue
Block a user