vault backup: 2024-08-17 07:25:49
This commit is contained in:
69
.obsidian/workspace.json
vendored
69
.obsidian/workspace.json
vendored
@@ -4,33 +4,23 @@
|
||||
"type": "split",
|
||||
"children": [
|
||||
{
|
||||
"id": "2427cc8e62f1578c",
|
||||
"id": "f71ac71eaea3f5c1",
|
||||
"type": "tabs",
|
||||
"children": [
|
||||
{
|
||||
"id": "d9b32ed784739835",
|
||||
"id": "978b6c83b571bfcd",
|
||||
"type": "leaf",
|
||||
"state": {
|
||||
"type": "diff-view",
|
||||
"type": "markdown",
|
||||
"state": {
|
||||
"file": "conflict-files-obsidian-git.md",
|
||||
"staged": false
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": "63af3b8fcfd93b5e",
|
||||
"type": "leaf",
|
||||
"state": {
|
||||
"type": "diff-view",
|
||||
"state": {
|
||||
"file": "2024-08-14 (Wednesday).md",
|
||||
"staged": true
|
||||
"file": "2024-08-17 (Saturday).md",
|
||||
"mode": "source",
|
||||
"backlinks": false,
|
||||
"source": false
|
||||
}
|
||||
}
|
||||
}
|
||||
],
|
||||
"currentTab": 1
|
||||
]
|
||||
}
|
||||
],
|
||||
"direction": "vertical"
|
||||
@@ -76,8 +66,7 @@
|
||||
"state": {}
|
||||
}
|
||||
}
|
||||
],
|
||||
"currentTab": 1
|
||||
]
|
||||
}
|
||||
],
|
||||
"direction": "horizontal",
|
||||
@@ -97,6 +86,7 @@
|
||||
"state": {
|
||||
"type": "backlink",
|
||||
"state": {
|
||||
"file": "2024-08-14 (Wednesday).md",
|
||||
"collapseAll": false,
|
||||
"extraContext": false,
|
||||
"sortOrder": "alphabetical",
|
||||
@@ -113,6 +103,7 @@
|
||||
"state": {
|
||||
"type": "outgoing-link",
|
||||
"state": {
|
||||
"file": "2024-08-17 (Saturday).md",
|
||||
"linksCollapsed": false,
|
||||
"unlinkedCollapsed": false
|
||||
}
|
||||
@@ -134,7 +125,9 @@
|
||||
"type": "leaf",
|
||||
"state": {
|
||||
"type": "outline",
|
||||
"state": {}
|
||||
"state": {
|
||||
"file": "2024-08-17 (Saturday).md"
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -144,9 +137,29 @@
|
||||
"type": "git-view",
|
||||
"state": {}
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": "34e56b59da824976",
|
||||
"type": "leaf",
|
||||
"state": {
|
||||
"type": "calendar",
|
||||
"state": {}
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": "8ba1030f6192b596",
|
||||
"type": "leaf",
|
||||
"state": {
|
||||
"type": "all-properties",
|
||||
"state": {
|
||||
"sortOrder": "frequency",
|
||||
"showSearch": false,
|
||||
"searchQuery": ""
|
||||
}
|
||||
}
|
||||
}
|
||||
],
|
||||
"currentTab": 4
|
||||
"currentTab": 1
|
||||
}
|
||||
],
|
||||
"direction": "horizontal",
|
||||
@@ -163,10 +176,14 @@
|
||||
"obsidian-importer:Open Importer": false
|
||||
}
|
||||
},
|
||||
"active": "63af3b8fcfd93b5e",
|
||||
"active": "978b6c83b571bfcd",
|
||||
"lastOpenFiles": [
|
||||
"conflict-files-obsidian-git.md",
|
||||
"2024-08-15 (Thursday).md",
|
||||
"2024-08-17 (Saturday).md",
|
||||
"Kodi.md",
|
||||
"2024-08-14 (Wednesday).md",
|
||||
"2024-08-13 (Tuesday).md",
|
||||
"conflict-files-obsidian-git.md",
|
||||
"Work/Daily Log/2024-08-14 (Wednesday).md",
|
||||
"Work/Daily Log",
|
||||
"Quick Notes/Truck notes.md",
|
||||
@@ -188,10 +205,6 @@
|
||||
"People/Mitch Myers.md",
|
||||
"People/Mike Haines.md",
|
||||
"People/Michael Fisher.md",
|
||||
"People/Kate Neale.md",
|
||||
"People/Josh Grantham.md",
|
||||
"People/Joe Caun.md",
|
||||
"People/Edgar Martinez.md",
|
||||
"People",
|
||||
"Shopping",
|
||||
"Personal",
|
||||
|
||||
0
2024-08-15 (Thursday).md
Normal file
0
2024-08-15 (Thursday).md
Normal file
0
2024-08-17 (Saturday).md
Normal file
0
2024-08-17 (Saturday).md
Normal file
8
Kodi.md
Normal file
8
Kodi.md
Normal file
@@ -0,0 +1,8 @@
|
||||
#homelab #media-center
|
||||
|
||||
[[2024-08-14 (Wednesday)]]
|
||||
|
||||
Looked into Kodi a little bit today to see how it might fit into my hopes to have a "home lab" some day to store all of our files and media locally.
|
||||
|
||||
https://kodi.tv/about/
|
||||
|
||||
@@ -1,17 +0,0 @@
|
||||
# Conflicts
|
||||
Please resolve them and commit them using the commands `Git: Commit all changes` followed by `Git: Push`
|
||||
(This file will automatically be deleted before commit)
|
||||
[[#Additional Instructions]] available below file list
|
||||
|
||||
- Not a file: .obsidian/workspace.json
|
||||
|
||||
# Additional Instructions
|
||||
I strongly recommend to use "Source mode" for viewing the conflicted files. For simple conflicts, in each file listed above replace every occurrence of the following text blocks with the desired text.
|
||||
|
||||
```diff
|
||||
<<<<<<< HEAD
|
||||
File changes in local repository
|
||||
=======
|
||||
File changes in remote repository
|
||||
>>>>>>> origin/main
|
||||
```
|
||||
Reference in New Issue
Block a user