Merge remote-tracking branch 'origin/main'

.obsidian/app.json

@@ -3,7 +3,7 @@
   "showUnsupportedFiles": true,
   "attachmentFolderPath": "./",
   "pdfExportSettings": {
-    "includeName": true,
+    "includeName": false,
     "pageSize": "A4",
     "landscape": false,
     "margin": "0",

.obsidian/graph.json

@@ -25,6 +25,6 @@
   "repelStrength": 10,
   "linkStrength": 1,
   "linkDistance": 250,
-  "scale": 0.9425839674592027,
+  "scale": 0.2792841385064304,
   "close": true
 }

.obsidian/plugins/obsidian-git/data.json

@@ -1,9 +1,9 @@
 {
   "commitMessage": "vault backup: {{date}}",
   "commitDateFormat": "YYYY-MM-DD HH:mm:ss",
-  "autoSaveInterval": 90,
-  "autoPushInterval": 1,
-  "autoPullInterval": 45,
+  "autoSaveInterval": 0,
+  "autoPushInterval": 0,
+  "autoPullInterval": 0,
   "autoPullOnBoot": false,
   "disablePush": false,
   "pullBeforePush": true,
@@ -14,7 +14,7 @@
   "updateSubmodules": false,
   "syncMethod": "merge",
   "customMessageOnAutoBackup": false,
-  "autoBackupAfterFileChange": true,
+  "autoBackupAfterFileChange": false,
   "treeStructure": false,
   "refreshSourceControl": true,
   "basePath": "",
@@ -50,9 +50,7 @@
     },
     "textColorCss": "var(--text-muted)",
     "ignoreWhitespace": false,
-    "gutterSpacingFallbackLength": 5,
-    "lastShownAuthorDisplay": "initials",
-    "lastShownDateTimeFormatOptions": "date"
+    "gutterSpacingFallbackLength": 5
   },
   "autoCommitMessage": "vault backup: {{date}}"
 }

.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",