Jordi/obsidian
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/Lachstop' into Lachstop

Browse Source
This commit is contained in:
Gentleman-DE
2023-04-24 18:48:58 +02:00
parent 3a104fcbbc fcca92573b
commit 137aea711c
1 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
.obsidian/workspace.json vendored
View File

@@ -55,9 +55,21 @@
"source": false "source": false
} }
} }
},
{
"id": "80591b06329809e3",
"type": "leaf",
"state": {
"type": "markdown",
"state": {
"file": "conflict-files-obsidian-git.md",
"mode": "source",
"source": false
}
}
} }
], ],
"currentTab": 3 "currentTab": 4
}, },
{ {
"id": "47553fa673bb1eb6", "id": "47553fa673bb1eb6",
@@ -171,7 +183,7 @@
"state": { "state": {
"type": "backlink", "type": "backlink",
"state": { "state": {
"file": "Mathe/KW17/KW17.md", "file": "conflict-files-obsidian-git.md",
"collapseAll": false, "collapseAll": false,
"extraContext": false, "extraContext": false,
"sortOrder": "alphabetical", "sortOrder": "alphabetical",
@@ -188,7 +200,7 @@
"state": { "state": {
"type": "outgoing-link", "type": "outgoing-link",
"state": { "state": {
"file": "Mathe/KW17/KW17.md", "file": "conflict-files-obsidian-git.md",
"linksCollapsed": false, "linksCollapsed": false,
"unlinkedCollapsed": true "unlinkedCollapsed": true
} }
@@ -211,7 +223,7 @@
"state": { "state": {
"type": "outline", "type": "outline",
"state": { "state": {
"file": "Mathe/KW17/KW17.md" "file": "conflict-files-obsidian-git.md"
} }
} }
}, },
@@ -272,10 +284,11 @@
"juggl:Juggl global graph": false "juggl:Juggl global graph": false
} }
}, },
"active": "4759485602209736", "active": "80591b06329809e3",
"lastOpenFiles": [ "lastOpenFiles": [
"Informationssicherheit/Ueb3/Ueb3.md",
"Mathe/KW17/KW17.md", "Mathe/KW17/KW17.md",
"conflict-files-obsidian-git.md",
"Informationssicherheit/Ueb3/Ueb3.md",
"Mathe/KW17/KW17-GeoTra.pdf", "Mathe/KW17/KW17-GeoTra.pdf",
"Mathe/KW17/KW17-GeoTra_vor.pdf", "Mathe/KW17/KW17-GeoTra_vor.pdf",
"Mathe/KW17", "Mathe/KW17",
@@ -284,7 +297,6 @@
"CCN/Ex02/ccn1-exercise2.pdf", "CCN/Ex02/ccn1-exercise2.pdf",
"CCN/Untitled.md", "CCN/Untitled.md",
"CCN/Ex02", "CCN/Ex02",
"conflict-files-obsidian-git.md",
"unterwäsche_austausch_nein.jpg.md", "unterwäsche_austausch_nein.jpg.md",
"Informationssicherheit/VL/03-ueb_uebungsblatt.pdf", "Informationssicherheit/VL/03-ueb_uebungsblatt.pdf",
"Informationssicherheit/Ueb2/Ueb2.md", "Informationssicherheit/Ueb2/Ueb2.md",