Merge remote-tracking branch 'refs/remotes/origin/master'
This commit is contained in:
commit
289617a968
18
.obsidian/plugins/obsidian-git/data.json
vendored
18
.obsidian/plugins/obsidian-git/data.json
vendored
@ -1,24 +1,24 @@
|
|||||||
{
|
{
|
||||||
"commitMessage": "vault backup: {{date}}",
|
"commitMessage": "vault backup: {{date}}",
|
||||||
"commitDateFormat": "YYYY-MM-DD HH:mm:ss",
|
"commitDateFormat": "YYYY-MM-DD HH:mm:ss",
|
||||||
"autoSaveInterval": 0,
|
"autoSaveInterval": 5,
|
||||||
"autoPushInterval": 0,
|
"autoPushInterval": 5,
|
||||||
"autoPullInterval": 0,
|
"autoPullInterval": 5,
|
||||||
"autoPullOnBoot": false,
|
"autoPullOnBoot": true,
|
||||||
"disablePush": false,
|
"disablePush": false,
|
||||||
"pullBeforePush": true,
|
"pullBeforePush": true,
|
||||||
"disablePopups": false,
|
"disablePopups": false,
|
||||||
"disablePopupsForNoChanges": false,
|
"disablePopupsForNoChanges": false,
|
||||||
"listChangedFilesInMessageBody": false,
|
"listChangedFilesInMessageBody": true,
|
||||||
"showStatusBar": true,
|
"showStatusBar": true,
|
||||||
"updateSubmodules": false,
|
"updateSubmodules": false,
|
||||||
"syncMethod": "merge",
|
"syncMethod": "merge",
|
||||||
"customMessageOnAutoBackup": false,
|
"customMessageOnAutoBackup": false,
|
||||||
"autoBackupAfterFileChange": false,
|
"autoBackupAfterFileChange": true,
|
||||||
"treeStructure": false,
|
"treeStructure": false,
|
||||||
"refreshSourceControl": true,
|
"refreshSourceControl": true,
|
||||||
"basePath": "",
|
"basePath": "",
|
||||||
"differentIntervalCommitAndPush": false,
|
"differentIntervalCommitAndPush": true,
|
||||||
"changedFilesInStatusBar": false,
|
"changedFilesInStatusBar": false,
|
||||||
"showedMobileNotice": true,
|
"showedMobileNotice": true,
|
||||||
"refreshSourceControlTimer": 7000,
|
"refreshSourceControlTimer": 7000,
|
||||||
@ -51,7 +51,9 @@
|
|||||||
},
|
},
|
||||||
"textColorCss": "var(--text-muted)",
|
"textColorCss": "var(--text-muted)",
|
||||||
"ignoreWhitespace": false,
|
"ignoreWhitespace": false,
|
||||||
"gutterSpacingFallbackLength": 5
|
"gutterSpacingFallbackLength": 5,
|
||||||
|
"lastShownAuthorDisplay": "initials",
|
||||||
|
"lastShownDateTimeFormatOptions": "date"
|
||||||
},
|
},
|
||||||
"autoCommitMessage": "vault backup: {{date}}"
|
"autoCommitMessage": "vault backup: {{date}}"
|
||||||
}
|
}
|
||||||
27
.obsidian/workspace.json
vendored
27
.obsidian/workspace.json
vendored
@ -4,21 +4,21 @@
|
|||||||
"type": "split",
|
"type": "split",
|
||||||
"children": [
|
"children": [
|
||||||
{
|
{
|
||||||
"id": "2fd9b52cd580de3a",
|
"id": "3cab78fd608ddee3",
|
||||||
"type": "tabs",
|
"type": "tabs",
|
||||||
"children": [
|
"children": [
|
||||||
{
|
{
|
||||||
"id": "dced4c33323e7248",
|
"id": "9ad03e5313050bcf",
|
||||||
"type": "leaf",
|
"type": "leaf",
|
||||||
"state": {
|
"state": {
|
||||||
"type": "split-diff-view",
|
"type": "markdown",
|
||||||
"state": {
|
"state": {
|
||||||
"aFile": ".gitignore",
|
"file": "Welcome.md",
|
||||||
"bFile": ".gitignore",
|
"mode": "source",
|
||||||
"aRef": ""
|
"source": false
|
||||||
},
|
},
|
||||||
"icon": "diff",
|
"icon": "lucide-file",
|
||||||
"title": "Diff: .gitignore"
|
"title": "Welcome"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
@ -94,6 +94,7 @@
|
|||||||
"state": {
|
"state": {
|
||||||
"type": "backlink",
|
"type": "backlink",
|
||||||
"state": {
|
"state": {
|
||||||
|
"file": "Welcome.md",
|
||||||
"collapseAll": false,
|
"collapseAll": false,
|
||||||
"extraContext": false,
|
"extraContext": false,
|
||||||
"sortOrder": "alphabetical",
|
"sortOrder": "alphabetical",
|
||||||
@ -103,7 +104,7 @@
|
|||||||
"unlinkedCollapsed": true
|
"unlinkedCollapsed": true
|
||||||
},
|
},
|
||||||
"icon": "links-coming-in",
|
"icon": "links-coming-in",
|
||||||
"title": "Backlinks"
|
"title": "Backlinks for Welcome"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@ -112,11 +113,12 @@
|
|||||||
"state": {
|
"state": {
|
||||||
"type": "outgoing-link",
|
"type": "outgoing-link",
|
||||||
"state": {
|
"state": {
|
||||||
|
"file": "Welcome.md",
|
||||||
"linksCollapsed": false,
|
"linksCollapsed": false,
|
||||||
"unlinkedCollapsed": true
|
"unlinkedCollapsed": true
|
||||||
},
|
},
|
||||||
"icon": "links-going-out",
|
"icon": "links-going-out",
|
||||||
"title": "Outgoing links"
|
"title": "Outgoing links from Welcome"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@ -140,12 +142,13 @@
|
|||||||
"state": {
|
"state": {
|
||||||
"type": "outline",
|
"type": "outline",
|
||||||
"state": {
|
"state": {
|
||||||
|
"file": "Welcome.md",
|
||||||
"followCursor": false,
|
"followCursor": false,
|
||||||
"showSearch": false,
|
"showSearch": false,
|
||||||
"searchQuery": ""
|
"searchQuery": ""
|
||||||
},
|
},
|
||||||
"icon": "lucide-list",
|
"icon": "lucide-list",
|
||||||
"title": "Outline"
|
"title": "Outline of Welcome"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@ -176,7 +179,7 @@
|
|||||||
"obsidian-git:Open Git source control": false
|
"obsidian-git:Open Git source control": false
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"active": "26ad150e10a3fcdb",
|
"active": "9ad03e5313050bcf",
|
||||||
"lastOpenFiles": [
|
"lastOpenFiles": [
|
||||||
"README.md",
|
"README.md",
|
||||||
"Welcome.md"
|
"Welcome.md"
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user