flancian/garden
0
0
Fork 0
mirror of https://github.com/flancian/garden.git synced 2026-08-07 06:56:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

hmm

Browse Source
This commit is contained in:
Flancian
2021-07-10 00:26:17 +02:00
parent c42a29b4b2 2502de31c7
commit b1893220e2
11 changed files with 162 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.obsidian-git-data
+2
View File
@@ -0,0 +1,2 @@
Sat Jul 10 2021 00:26:17 GMT+0200 (Central European Summer Time)
Sat Jul 10 2021 00:25:17 GMT+0200 (Central European Summer Time)
.obsidian/workspace
Vendored
+132 -57
View File
@@ -4,6 +4,7 @@
"type": "split",
"children": [
{
<<<<<<< HEAD
"id": "dfca63b6438bb043",
"type": "leaf",
"state": {
@@ -165,71 +166,138 @@
"state": {
"file": "agora bot.md",
"mode": "source"
=======
"id": "11cbe105accfc77d",
"type": "split",
"children": [
{
"id": "63f809452cff7c43",
"type": "leaf",
"state": {
"type": "markdown",
"state": {
"file": "2021-07-05.md",
"mode": "source"
}
}
},
{
"id": "7050f5d245741dcd",
"type": "leaf",
"state": {
"type": "markdown",
"state": {
"file": "chelsea hotel.md",
"mode": "source"
}
}
},
{
"id": "6bf5733da4a61bdc",
"type": "leaf",
"state": {
"type": "markdown",
"state": {
"file": "conflict-files-obsidian-git.md",
"mode": "source"
}
}
>>>>>>> 2502de31c7b1b954aedee99b8de4a6511c3f0220
}
}
],
"direction": "horizontal"
},
{
"id": "07ab9c32e6c5777d",
"id": "102fe6accb268a77",
"type": "split",
"children": [
{
"id": "ac5f7b266c2a5153",
"type": "leaf",
"state": {
"type": "markdown",
"state": {
"file": "2021-07-09.md",
"mode": "source"
}
}
},
{
"id": "490263fbb1804ee5",
"type": "leaf",
"state": {
"type": "markdown",
"state": {
"file": "sundar pichai.md",
"mode": "source"
}
}
},
{
"id": "26c9647cf3a2b0e4",
"type": "leaf",
"state": {
"type": "markdown",
"state": {
"file": "pyinstrument.md",
"mode": "source"
}
}
}
],
"direction": "horizontal"
},
{
"id": "55e7708b4a1b5ace",
"type": "leaf",
"state": {
"type": "markdown",
"state": {
"file": "would you agree.md",
"file": "2021-07-09.md",
"mode": "source"
}
}
},
{
"id": "471e8d5ffc499afd",
"id": "d797072e4f60237e",
"type": "leaf",
"state": {
"type": "markdown",
"state": {
"file": "the future of note taking.md",
"file": "enough about human rights.md",
"mode": "source"
}
}
},
{
"id": "59db8db05b79c3fc",
"id": "4c6ff7bb411b67a6",
"type": "leaf",
"state": {
"type": "markdown",
"state": {
"file": "future of note taking.md",
"file": "what about human rights.md",
"mode": "source"
}
}
},
{
"id": "7fa69ee82c4e4e81",
"id": "80fe0d9f20ae4908",
"type": "leaf",
"state": {
"type": "markdown",
"state": {
"file": "lightning talks.md",
"file": "mondegreens.md",
"mode": "source"
}
}
},
{
"id": "a2ef93a32f0a482b",
"id": "c9cab91c10439f0b",
"type": "leaf",
"state": {
"type": "markdown",
"state": {
"file": "tienson qin.md",
"mode": "source"
}
}
},
{
"id": "a153b20f56786261",
"type": "leaf",
"state": {
"type": "markdown",
"state": {
"file": "logseq.md",
"file": "human rights.md",
"mode": "source"
}
}
@@ -268,6 +336,14 @@
}
}
},
{
"id": "8af6596dc98ffa6b",
"type": "leaf",
"state": {
"type": "starred",
"state": {}
}
},
{
"id": "aa0f3e910050164c",
"type": "leaf",
@@ -293,56 +369,41 @@
"type": "tabs",
"children": [
{
"id": "eaa7f99b4cf5444a",
"id": "30e969c9166f9896",
"type": "leaf",
"state": {
"type": "empty",
"state": {}
"type": "backlink",
"state": {
"file": "sundar pichai.md",
"collapseAll": false,
"extraContext": false,
"sortOrder": "alphabetical",
"showSearch": false,
"searchQuery": "",
"backlinkCollapsed": false,
"unlinkedCollapsed": false
}
}
},
{
"id": "49a0eb72df05c98e",
"id": "a62fc60423ac06f4",
"type": "leaf",
"state": {
"type": "empty",
"state": {}
"type": "outline",
"state": {
"file": "sundar pichai.md"
}
}
}
]
},
{
"id": "9852b3b70c9ace3c",
"type": "tabs",
"children": [
{
"id": "ba82168a0acbacba",
"type": "leaf",
"state": {
"type": "empty",
"state": {}
}
}
]
},
{
"id": "297c54846b597552",
"type": "tabs",
"children": [
{
"id": "35550c211233c6a5",
"type": "leaf",
"state": {
"type": "empty",
"state": {}
}
}
]
],
"currentTab": 1
}
],
"direction": "horizontal",
"width": 300,
"collapsed": true
},
<<<<<<< HEAD
"active": "9b68ae9b83a078cc",
"lastOpenFiles": [
"flancian.md",
@@ -355,5 +416,19 @@
"2021-07-07.md",
"agora bot.md",
"would you agree.md"
=======
"active": "490263fbb1804ee5",
"lastOpenFiles": [
"sundar pichai.md",
"mondegreens.md",
"what about human rights.md",
"enough about human rights.md",
"2021-07-09.md",
"moondog.md",
"conflict-files-obsidian-git.md",
"pyinstrument.md",
"luciana.md",
"human rights.md"
>>>>>>> 2502de31c7b1b954aedee99b8de4a6511c3f0220
]
}
2021-07-09.md
+8
View File
@@ -0,0 +1,8 @@
- [[push]] [[flancia]]
- [[moondog]]
- [[enough about human rights]]
- [[flancian]]
- [[memedelperro]]
- https://twitter.com/flancian/status/1413546738686771207
- [[sundar pichai]]
- [[luciana]]
conflict-files-obsidian-git.md
+2 -2
View File
@@ -1,3 +1,3 @@
in Conflict files
# Conflict files
Please resolve them and commit per command (This file will be deleted before the commit).
- Not a file: .obsidian-git-data
- Not a file: .obsidian/workspace
enough about human rights.md
+1
View File
@@ -0,0 +1 @@
- [[pull]] [[what about human rights]]
human rights.md
+3 -4
View File
@@ -1,5 +1,4 @@
# Human Rights
- Presumably the most important thing in the universe.
- I believe they should be the same as that of all [[conscious beings]].
- [[rights]]
- Presumably the most important thing in the universe.
- I believe [[human rights]] should be the same of all [[conscious beings]].
luciana.md
+5 -4
View File
@@ -1,6 +1,7 @@
# Luciana
- A [[person]].
- In the [[Agora]]: https://anagora.org/@luciana.
- Using [[foam]].
- a [[flancian]]
- [[push]] [[flancian]]
- [[agora]] [[agora]]: https://anagora.org/
- [[pull]] [[@luciana]]
- [[obsidian]].
mondegreens.md
View File
moondog.md
+2
View File
@@ -0,0 +1,2 @@
- [[pull]] [[what about human rights]]
- [[pull]] [[rights]]
sundar pichai.md
+4
View File
@@ -0,0 +1,4 @@
- a [[person]].
- [[indian]]
- [[ceo]] of [[google]].
- [[pull]] [[google]]
what about human rights.md
+3
View File
@@ -0,0 +1,3 @@
- [[push]] [[mondegreens]].
- a [[song]] https://www.youtube.com/watch?v=-dLPsw3i_P8
- [[pull]] [[human rights]]