Merge ; commit '63746a2f835f9521273ae82a594393cc8ad9baff'

Conflicts:
	.obsidian/workspace
This commit is contained in:
2022-06-10 11:21:04 +08:00
16 changed files with 554 additions and 53 deletions

121
.obsidian/workspace vendored
View File

@@ -11,7 +11,7 @@
"type": "markdown",
"state": {
"file": "00. TOP/01. TODO.md",
"mode": "source",
"mode": "preview",
"source": true
}
}
@@ -35,25 +35,31 @@
"type": "mobile-drawer",
"children": [
{
"id": "88e1cff7a30f6953",
"type": "leaf",
"state": {
"type": "file-explorer",
"state": {}
}
},
{
"id": "ceb171daf1327c40",
"type": "leaf",
"state": {
"type": "search",
"state": {
"query": "",
"matchingCase": false,
"explainSearch": false,
"collapseAll": false,
"extraContext": false,
"sortOrder": "alphabetical"
"id": "dbd6f1d450f54a18",
"type": "tabs",
"children": [
{
"id": "f0c230180a9faaa1",
"type": "leaf",
"state": {
"type": "file-explorer",
"state": {}
}
},
{
"id": "81a47da514b9d823",
"type": "leaf",
"state": {
"type": "search",
"state": {
"query": "shared_ptr",
"matchingCase": false,
"explainSearch": false,
"collapseAll": false,
"extraContext": false,
"sortOrder": "alphabetical"
}
}
}
}
},
@@ -76,19 +82,50 @@
"type": "mobile-drawer",
"children": [
{
"id": "e3c9f68a35edf017",
"type": "leaf",
"state": {
"type": "backlink",
"state": {
"file": "00. TOP/01. TODO.md",
"collapseAll": false,
"extraContext": false,
"sortOrder": "alphabetical",
"showSearch": false,
"searchQuery": "",
"backlinkCollapsed": false,
"unlinkedCollapsed": true
"id": "74ab9d565ea062c4",
"type": "tabs",
"children": [
{
"id": "bcf01574fb3a7a3b",
"type": "leaf",
"state": {
"type": "backlink",
"state": {
"file": "00. TOP/01. TODO.md",
"collapseAll": true,
"extraContext": true,
"sortOrder": "alphabetical",
"showSearch": false,
"searchQuery": "",
"backlinkCollapsed": false,
"unlinkedCollapsed": false
}
}
},
{
"id": "509990f938113653",
"type": "leaf",
"state": {
"type": "advanced-tables-toolbar",
"state": {}
}
}
]
},
{
"id": "2b8688e445848e2a",
"type": "tabs",
"children": [
{
"id": "11f4d517d7b320b2",
"type": "leaf",
"state": {
"type": "tag",
"state": {
"sortOrder": "frequency",
"useHierarchy": true
}
}
}
}
}
@@ -98,14 +135,14 @@
"active": "94f0e8a81af6c9e2",
"lastOpenFiles": [
"00. TOP/01. TODO.md",
"00. TOP/00. Inbox.md",
"02. PARA/03. Resources資源/C++17/Class template.md",
"02. PARA/03. Resources資源/C++17/C++17.md",
"02. PARA/03. Resources資源/01. 架站/04. Gitea.md",
"02. PARA/03. Resources資源/Tool Setup/Obisidian.md",
"README.md",
"test.md",
"02. PARA/03. Resources資源/Proxmox VE.md",
"02. PARA/03. Resources資源/01. 架站/01. Nginx Layer4 Reverse Proxy.md"
"02. PARA/03. Resources資源/C++17/rvalue.md",
"02. PARA/03. Resources資源/C++17/move operator.md",
"02. PARA/03. Resources資源/C++17/智慧指標.md",
"02. PARA/03. Resources資源/git/submodule.md",
"02. PARA/03. Resources資源/git.md",
"02. PARA/01. Project專案/008. Sentinel.md",
"02. PARA/03. Resources資源/C++17/lvalue.md",
"02. PARA/03. Resources資源/FFMPEG/01. Setup.md",
"02. PARA/03. Resources資源/FFMPEG/00. Introduction.md"
]
}