Merge remote-tracking branch 'origin/main'

This commit is contained in:
2026-02-03 15:56:23 +01:00
24 changed files with 189 additions and 28 deletions

View File

@@ -20,8 +20,23 @@
"icon": "lucide-file",
"title": "Vorlesung 12"
}
},
{
"id": "9ef60fc87229ac1f",
"type": "leaf",
"state": {
"type": "markdown",
"state": {
"file": "conflict-files-obsidian-git.md",
"mode": "source",
"source": false
},
"icon": "lucide-file",
"title": "conflict-files-obsidian-git"
}
}
]
],
"currentTab": 1
}
],
"direction": "vertical"
@@ -191,12 +206,29 @@
"workspaces:Manage workspace layouts": false
}
},
"active": "a1b43276ca9ba4a4",
"active": "9ef60fc87229ac1f",
"lastOpenFiles": [
"Semester 7/REDIG/Vorlesung 9.md",
"Semester 7/INKOM/Vorlesung 12.md",
"Semester 7/REDIG/Vorlesung 10.md",
"conflict-files-obsidian-git.md",
"Semester 7/Robocup/REDIG/Übungsblatt 7.md",
"Semester 7/Robocup/REDIG/Vorlesung 9.md",
"Semester 7/Robocup/REDIG/Vorlesung 8.md",
"Semester 7/Robocup/REDIG/Vorlesung 5.md",
"Semester 7/Robocup/REDIG/Vorlesung 3.md",
"Semester 7/Robocup/REDIG/Vorlesung 2.md",
"Semester 7/Robocup/REDIG/Vorlesung 10.md",
"Semester 7/Robocup/REDIG/Vorlesung 1.md",
"Semester 7/Robocup/REDIG/Untitled.md",
"Semester 7/Robocup/REDIG/Nackenbruch.drawio.png",
"Semester 7/Robocup/REDIG/Architektur.png",
"Semester 7/Robocup/REDIG",
"Semester 7/INKOM/figures/Pasted image 20260128171830.png",
"Semester 7/INKOM/figures/Pasted image 20260128171756.png",
"Semester 7/INKOM/figures/Pasted image 20260127171242.png",
"Semester 7/INKOM/figures/Pasted image 20260127170559.png",
"Semester 7/INKOM/Klausurvorbereitung.md",
"Semester 7/REDIG/Vorlesung 9.md",
"Semester 7/REDIG/Vorlesung 10.md",
"Semester 6/List of Shame.md",
"Semester 7/INKOM/Vorlesung 11.md",
"Semester 7/Medienheorie/Vorlesung 10.md",
@@ -210,34 +242,17 @@
"Semester 7/REDIG/Untitled.md",
"Semester 7/REDIG/Architektur.png",
"Semester 7/Medienheorie/Vorlesung 9.md",
"Semester 6/Veranstaltungsplan.md",
"Semester 7/INKOM/Untitled 1.base",
"Semester 7/INKOM/Untitled.base",
"Semester 7/Medienheorie/Hausaufgabe Speichermedien.md",
"Semester 7/Robocup/Pain.pptx",
"Semester 7/INKOM/präsi_2FA/2FA.pptx",
"Semester 8/Bachelorthesis/Zu klärende Fragen.md",
"Semester 8/Bachelorthesis",
"Semester 8",
"Semester 7/Medienheorie/Pasted image 20251214161803.png",
"Semester 7/INKOM/präsi_2FA/Untitled.base",
"Semester 7/INKOM/präsi_2FA/Untitled 8.base",
"Semester 7/INKOM/präsi_2FA/Untitled 7.base",
"Semester 7/INKOM/präsi_2FA/Untitled 6.base",
"Semester 7/INKOM/präsi_2FA/Recherche.md",
"Semester 7/INKOM/präsi_2FA/Quellen.md",
"Semester 7/INKOM/präsi_2FA/Vorgehensweise.md",
"Semester 7/Bildverarbeitung/Wissenschaftliche Arbeiten (nach Dek. Trittin).md",
"Praktikum/Hella.md",
"Semester 7/Medienheorie/Vorlesung 8.md",
"Semester 7/Medienheorie/Vorlesung 7.md",
"Semester 7/INKOM/figures/Pasted image 20251107093559.png",
"Semester 6/COMARCH/Zusammenfassung/Pasted image 20250708193937.png",
"Semester 6/COMARCH/Zusammenfassung/Pasted image 20250708193917.png",
"Semester 6/COMARCH/Zusammenfassung/Pasted image 20250708185932.png",
"Semester 6/COMARCH/Zusammenfassung/Pasted image 20250708185618.png",
"Semester 6/COMARCH/Zusammenfassung/Pasted image 20250708185152.png",
"Semester 6/COMARCH/Zusammenfassung/Pasted image 20250708185128.png",
"Semester 6/COMARCH/Pasted image 20250709205101.png"
"Semester 6/COMARCH/Zusammenfassung/Pasted image 20250708193937.png"
]
}