Merge branch 'main' of https://gitea.31718216.xyz/fzzinchemical/TI-Studium-Mitschriften
This commit is contained in:
34
.obsidian/workspace.json
vendored
34
.obsidian/workspace.json
vendored
@@ -13,12 +13,20 @@
|
||||
"state": {
|
||||
"type": "markdown",
|
||||
"state": {
|
||||
<<<<<<< HEAD
|
||||
"file": "conflict-files-obsidian-git.md",
|
||||
=======
|
||||
"file": "Semester 6/SWTEST/Zusammenfassungen/CTFL-Kapitel 4-2.md",
|
||||
>>>>>>> 07e628aaa4f600dff70a622adda75bedef2bbe8a
|
||||
"mode": "source",
|
||||
"source": false
|
||||
},
|
||||
"icon": "lucide-file",
|
||||
<<<<<<< HEAD
|
||||
"title": "conflict-files-obsidian-git"
|
||||
=======
|
||||
"title": "CTFL-Kapitel 4-2"
|
||||
>>>>>>> 07e628aaa4f600dff70a622adda75bedef2bbe8a
|
||||
}
|
||||
}
|
||||
]
|
||||
@@ -187,6 +195,7 @@
|
||||
},
|
||||
"active": "0b3e25477c9392f1",
|
||||
"lastOpenFiles": [
|
||||
<<<<<<< HEAD
|
||||
"conflict-files-obsidian-git.md",
|
||||
"Semester 6/COMARCH/Zusammenfassung/Vorlesung 2.md",
|
||||
"Semester 6/COMARCH/Klausurvorbereitungs Spreadsheed.md",
|
||||
@@ -233,5 +242,30 @@
|
||||
"Semester 6/COMARCH",
|
||||
"Semester 5",
|
||||
"Semester 3/BESYST/04_Blatt_Loesung.pdf"
|
||||
=======
|
||||
"Semester 6/SWTEST/Letzte Vorlesung.md",
|
||||
"Semester 6/SWTEST/Zusammenfassungen/CTFL-Kapitel 0.md",
|
||||
"Semester 4/MICONT/Probeklausur 2025.md",
|
||||
"Semester 6/SWTEST/Zusammenfassungen",
|
||||
"Semester 6/COMARCH/Zusammenfassung/Vorlesung 4.md",
|
||||
"Semester 6/COMARCH/Zusammenfassung/Vorlesung 3a.md",
|
||||
"Semester 6/COMARCH/Zusammenfassung/Vorlesung 3.md",
|
||||
"Semester 6/COMARCH/Zusammenfassung/Vorlesung 1.md",
|
||||
"Semester 6/COMARCH/Zusammenfassung/Vorlesung 2.md",
|
||||
"Semester 6/COMARCH/Zusammenfassung/Vorlesung Kompakt.md",
|
||||
"Dayplanner/2024-01-27.md",
|
||||
"Dayplanner/2024-01-25.md",
|
||||
"Dayplanner",
|
||||
"Semester 6/COMARCH/Zusammenfassung/Vorlesung 11.md",
|
||||
"Semester 6/COMARCH/Zusammenfassung/Vorlesung 10.md",
|
||||
"Semester 6/COMARCH/Zusammenfassung/Vorlesung 9.md",
|
||||
"Semester 6/COMARCH/Zusammenfassung/Vorlesung 8b.md",
|
||||
"Semester 6/COMARCH/Zusammenfassung/Vorlesung 8a.md",
|
||||
"Semester 6/COMARCH/Zusammenfassung/Vorlesung 7.md",
|
||||
"Semester 6/COMARCH/Zusammenfassung/Vorlesung 6.md",
|
||||
"Semester 6/COMARCH/Zusammenfassung/Vorlesung 5.md",
|
||||
"Semester 6/COMARCH/Zusammenfassung",
|
||||
"Semester 6/COMARCH"
|
||||
>>>>>>> 07e628aaa4f600dff70a622adda75bedef2bbe8a
|
||||
]
|
||||
}
|
||||
Reference in New Issue
Block a user