Merge remote-tracking branch 'origin/main'

.obsidian/workspace.json

@@ -46,9 +46,23 @@
               "icon": "lucide-book-up",
               "title": "Release Notes 1.11.5"
             }
+          },
+          {
+            "id": "123e9eed17f68f4b",
+            "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": 2
+        "currentTab": 3
       }
     ],
     "direction": "vertical"
@@ -218,8 +232,10 @@
       "workspaces:Manage workspace layouts": false
     }
   },
-  "active": "ae9ebe2f65d51bc1",
+  "active": "123e9eed17f68f4b",
   "lastOpenFiles": [
+    "conflict-files-obsidian-git.md",
+    "Semester 6/List of Shame.md",
     "Semester 7/REDIG/Vorlesung 9.md",
     "Semester 7/REDIG/Vorlesung 10.md",
     "Semester 7/INKOM/Vorlesung 11.md",
@@ -253,11 +269,9 @@
     "Semester 7/INKOM/präsi_2FA/Vorgehensweise.md",
     "Semester 7/Bildverarbeitung/Wissenschaftliche Arbeiten (nach Dek. Trittin).md",
     "Praktikum/Hella.md",
-    "Semester 6/List of Shame.md",
     "Semester 7/Medienheorie/Vorlesung 8.md",
     "Semester 7/Medienheorie/Vorlesung 7.md",
     "Semester 7/REDIG/Übungsblatt 7.md",
-    "Semester 7/REDIG/Vorlesung 8.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",