Merge remote-tracking branch 'origin/main'

This commit is contained in:
fzzinchemical
2025-07-21 11:52:03 +02:00
20 changed files with 363 additions and 159 deletions

View File

@@ -4,21 +4,21 @@
"type": "split",
"children": [
{
"id": "6945bad5f5304a58",
"id": "ba40b2b7af1fccbf",
"type": "tabs",
"children": [
{
"id": "b169049ef16133ec",
"id": "0b3e25477c9392f1",
"type": "leaf",
"state": {
"type": "markdown",
"state": {
"file": "Semester 6/COMARCH/Zusammenfassung/Vorlesung 1.md",
"file": "conflict-files-obsidian-git.md",
"mode": "source",
"source": false
},
"icon": "lucide-file",
"title": "Vorlesung 1"
"title": "conflict-files-obsidian-git"
}
}
]
@@ -185,18 +185,38 @@
"workspaces:Manage workspace layouts": false
}
},
"active": "b169049ef16133ec",
"active": "0b3e25477c9392f1",
"lastOpenFiles": [
"Semester 6/COMARCH/Zusammenfassung/Vorlesung Kompakt.md",
"conflict-files-obsidian-git.md",
"Semester 6/COMARCH/Zusammenfassung/Vorlesung 2.md",
"Semester 6/COMARCH/Klausurvorbereitungs Spreadsheed.md",
"Semester 6/SWTEST/Klausurrelevantes Milan.md",
"Semester 6/COMARCH/Beispiele Klausurfragen.md",
"Semester 6/COMARCH/Zusammenfassung/Fragenkatalog.md",
"Semester 6/COMARCH/Zusammenfassung/Pasted image 20250708193937.png",
"Semester 6/COMARCH/Pasted image 20250709205101.png",
"Semester 6/COMARCH/Pasted image 20250709205049.png",
"Semester 6/SWTEST/CTFL-Kapitel 6.md",
"Semester 6/SWTEST/Klausurvorbereitung.md",
"Semester 4/ITSARCH/Klausurvorbereitung ITSARCH.md",
"Semester 4/ITSARCH/Pasted image 20240704185247.png",
"Semester 4/ITSARCH/Pasted image 20240704185748.png",
"Semester 4/ITSARCH/Pasted image 20240704190109.png",
"Semester 4/ITSARCH/Pasted image 20240709173104.png",
"Semester 4/ITSARCH/Pasted image 20240709174509.png",
"Semester 4/ITSARCH/ITSARCH Vorlesung.md",
"Semester 6/COMARCH/Zusammenfassung/Vorlesung 1.md",
"Semester 6/COMARCH/Zusammenfassung/Vorlesung 5.md",
"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 2.md",
"Semester 6/COMARCH/Zusammenfassung/Vorlesung 1.md",
"Semester 6/COMARCH/Zusammenfassung/Pasted image 20250708193917.png",
"Semester 6/COMARCH/Zusammenfassung/Vorlesung 9.md",
"Semester 6/COMARCH/Zusammenfassung/Pasted image 20250708185932.png",
"Semester 6/COMARCH/Zusammenfassung/Vorlesung Kompakt.md",
"Semester 6/COMARCH/Zusammenfassung/COMARCH.7z",
"Semester 6/ITSARCH/Klausurvorbereitung.md",
"Semester 6/SWTEST/Liste Exams.md",
"Semester 6/SWTEST/Klausurvorbereitung.md",
"Semester 6/SWTEST/CTFL-Kapitel 6.md",
"Semester 6/SWTEST/CTFL-Kapitel 5.md",
"Semester 6/SWTEST/CTFL-Kapitel 4-2.md",
"Semester 6/SWTEST/CTFL-Kapitel 4-1.md",
@@ -204,22 +224,10 @@
"Semester 6/SWTEST/CTFL-Kapitel 2.md",
"Semester 6/SWTEST/CTFL-Kapitel 0.md",
"Semester 6/SWTEST/CTFL-Kapitel 1.md",
"Semester 6/ITSARCH/Skript_Notizen/Exploits IDS_IPS.md",
"Semester 6/ITSARCH/Labore/Zusammenfassung.md",
"Semester 6/ITSARCH/Labore/010-Passwortsicherheit.md",
"Semester 6/ITSARCH/Labore/060-portscans.pdf",
"Semester 6/ITSARCH/Labore/Abbildungen/netstat.png",
"Semester 6/ITSARCH/Labore/Abbildungen",
"Semester 6/ITSARCH/Labore/Abbildungen/nmap.png",
"Semester 6/COMARCH/Vorlesung",
"Semester 6/ITSARCH/Skript_Notizen/Firewalling.md",
"Semester 6/ITSARCH/Skript_Notizen/Hash-Algorithmen.md",
"Semester 6/ITSARCH/Skript_Notizen/IPSEC.md",
"Semester 6/ITSARCH/Skript_Notizen/IPTables.md",
"Semester 6/ITSARCH/Skript_Notizen/SSH.md",
"Semester 6/ITSARCH/Skript_Notizen/TLS 4.5.md",
"Semester 6/SWTEST",
"Untitled.md",
"Semester 5/BWL",
"Semester 6/ITSARCH/Skript_Notizen",
"Semester 6/COMARCH",