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

.obsidian/workspace.json

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