diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..7043ff1 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ + +*.json diff --git a/.obsidian/plugins/obsidian-livesync/data.json b/.obsidian/plugins/obsidian-livesync/data.json index dd78b32..a5dc67e 100644 --- a/.obsidian/plugins/obsidian-livesync/data.json +++ b/.obsidian/plugins/obsidian-livesync/data.json @@ -39,7 +39,7 @@ "disableRequestURI": true, "skipOlderFilesOnSync": true, "checkConflictOnlyOnOpen": false, - "syncInternalFiles": true, + "syncInternalFiles": false, "syncInternalFilesBeforeReplication": true, "syncInternalFilesIgnorePatterns": "\\/node_modules\\/, \\/\\.git\\/, \\/obsidian-livesync\\/", "syncInternalFilesInterval": 60, @@ -58,8 +58,8 @@ "useDynamicIterationCount": false, "syncAfterMerge": false, "configPassphraseStore": "", - "encryptedPassphrase": "[\"H3ou/PWSB5pRUXPWr2tf6fOBU9ZkxYbSCQeLsI4=\",\"33a1cd6d0a41b9d55e83dab704000000\",\"72481d2255aae61b8a69ffcb2e9c5f57\"]", - "encryptedCouchDBConnection": "[\"1tJqLUcSYNqQqEQn67t2Dc2aqteUL4ZrQB5Bkxaiv1gTOCECJIaOSo0/PJc/zpFWkGMsULxjDfmvdQA6eQ1DNANWEQeJKUU/5kDNRF6aX0u5Bpx14ELwX6GUlKjttdetLBIXZa5log62HGyPPewZrZCdFVlgDgZGgo6Fj0x5G1Td3qYNylAHdhrOJbvwuNOby8eLNYDuYpLQ/JosdCO05Yc=\",\"33a1cd6d0a41b9d55e83dab703000000\",\"72481d2255aae61b8a69ffcb2e9c5f57\"]", + "encryptedPassphrase": "[\"y6yAui3vE4bsVgRvKomi7TCONNIQzPnvEt1CdZc=\",\"2d9653b0195d7df6a527befb9e010000\",\"8347c94b5ee25f8d42b79c8d1ea4690b\"]", + "encryptedCouchDBConnection": "[\"vcgPc5wH8AkCATgOoqKJsUFq7H53OdZDqgbBzgZcmWXQ1wb+QdAo+bTR1ev9JNmDiAHf/R4S72+wqAiiqQRLFlYBGYzD5NY0XRxCm1VKKSnyYhG4XgccLxCwP4kaBaeEN/MUxOCLkKwnGVBrDKgwwzoiy0b9pVcXlU2Y3OsUpmjbDC+OEbR/ZDegDioJ71GTlJzRof0+Ay94l5FOt1TYjqU=\",\"2d9653b0195d7df6a527befb9d010000\",\"8347c94b5ee25f8d42b79c8d1ea4690b\"]", "permitEmptyPassphrase": false, "useIndexedDBAdapter": false, "useTimeouts": false, diff --git a/.obsidian/workspace.json b/.obsidian/workspace.json index eafbd51..59dc35a 100644 --- a/.obsidian/workspace.json +++ b/.obsidian/workspace.json @@ -6,7 +6,7 @@ { "id": "08ad9b53ade42d31", "type": "tabs", - "dimension": 62.59025270758123, + "dimension": 61.73857868020305, "children": [ { "id": "829ecd06322baed5", @@ -62,7 +62,7 @@ { "id": "47553fa673bb1eb6", "type": "tabs", - "dimension": 37.40974729241877, + "dimension": 38.26142131979696, "children": [ { "id": "b2fab346c5df81de", @@ -274,17 +274,17 @@ }, "active": "4759485602209736", "lastOpenFiles": [ + "conflict-files-obsidian-git.md", + "Mathe/KW17/KW17.md", + "Informationssicherheit/Ueb3/Ueb3.md", "Mathe/KW17/KW17-GeoTra.pdf", "Mathe/KW17/KW17-GeoTra_vor.pdf", - "Mathe/KW17/KW17.md", "Mathe/KW17", - "Informationssicherheit/Ueb3/Ueb3.md", "Informationssicherheit/Ueb3/03-ueb_uebungsblatt.pdf", "CCN/Ex02/Exercise 2.md", "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", @@ -293,7 +293,6 @@ "CCN/VL01.md", "Mathe/KW16/UEB.md", "Mathe/KW16/KW16-EWuuEV_vor.pdf", - "Mathe/KW16/KW16-EWuuEV.pdf", "CCN/Ex01/Exercise 1.md", "CCN/Ex01/2023-04-18_11-08.png", "Algorithmen und Datenstrukturen/UEB03/UEB03.md",