Commit Graph

32 Commits

Author SHA1 Message Date
Calvin Vitting e1825c50a4 Grundlage merge konflikt 2026-08-30 00:01:30 +02:00
Carl Vitting 126bb266ae DS_Store proper Ignore 2026-08-29 23:47:56 +02:00
Carl Vitting 244d49c8dd DS_Store removal 2026-08-29 23:42:40 +02:00
Carl Vitting b2b30c3cb4 digga diesmal gitignore aber ernst zum letzen mal 2026-08-29 23:36:01 +02:00
Carl Vitting 57a8e6b443 vault backup: 2026-08-29 23:28:45 2026-08-29 23:28:45 +02:00
Carl Vitting 5ea2dc1ed8 vault backup: 2026-08-29 23:25:31 2026-08-29 23:25:31 +02:00
Carl Vitting 9ccbaa697e vault backup: 2026-08-29 21:47:07 2026-08-29 22:27:42 +02:00
Calvin Vitting ecc0775ba6 gitignore 2026-08-27 22:24:59 +02:00
Calvin Vitting 4230393d5b delete obsidian.workspace from git as it is only locally important 2026-08-27 22:13:38 +02:00
Calvin Vitting 6dfebc165f Revert "main ist nur noch für die gemeinsame Grundlage da, carl hat eigenen branch, ich habe einen eigenen branch, wir können so vom main immer zu unserern branches reinmergen"
This reverts commit de5e3a109b.
2026-08-27 22:12:30 +02:00
Calvin Vitting d24cd758b4 Revert "Erklärung"
This reverts commit 1649589234.
2026-08-27 22:12:28 +02:00
Calvin Vitting cdf7e2ca4f Revert "ignore local workspace.json and add ignore file"
This reverts commit bcb85a7012.
2026-08-27 22:12:25 +02:00
Calvin Vitting bcb85a7012 ignore local workspace.json and add ignore file 2026-08-27 22:10:33 +02:00
Calvin Vitting 1649589234 Erklärung 2026-08-27 22:04:41 +02:00
Calvin Vitting de5e3a109b main ist nur noch für die gemeinsame Grundlage da, carl hat eigenen branch, ich habe einen eigenen branch, wir können so vom main immer zu unserern branches reinmergen 2026-08-27 21:55:29 +02:00
Calvin Vitting f369686774 Merge remote-tracking branch 'origin/main' 2026-08-27 21:07:33 +02:00
Calvin Vitting d8a667028f Added Grundlage von der wir getrennte/halbverbundene Wege schreiben können 2026-08-27 21:07:10 +02:00
Carl Vitting 1c46b1e05c vault backup: 2026-08-18 15:17:14 2026-08-18 15:17:14 +02:00
Carl Vitting 39dc9935cd vault backup: 2026-08-18 15:12:55 2026-08-18 15:12:55 +02:00
Carl Vitting 5a59d65229 vault backup: 2026-06-18 15:29:14 2026-06-18 15:29:14 +02:00
Carl Vitting 49043f7f5f vault backup: 2026-06-12 12:31:53 2026-06-12 12:31:53 +02:00
Carl Vitting da267cd4eb vault backup: 2026-06-03 21:06:51 2026-06-03 21:06:51 +02:00
Carl Vitting 8cb797a480 vault backup: 2026-06-03 20:56:28 2026-06-03 20:56:28 +02:00
Carl Vitting 4933427a1a vault backup: 2026-06-03 20:36:58 2026-06-03 20:36:58 +02:00
Calvin Vitting 6d9ed8c22f vault backup: 2026-06-01 13:27:15 2026-06-01 13:27:15 +02:00
Calvin Vitting 13266ff803 vault backup: 2026-06-01 13:27:05 2026-06-01 13:27:05 +02:00
Carl Vitting a91b86515e Merge remote-tracking branch 'origin/main' 2026-05-23 23:16:19 +02:00
Carl Vitting 1769180639 vault backup: 2026-05-23 23:16:18 2026-05-23 23:16:18 +02:00
carl b2df75efdd Delete 260523-Cailiau-1. 2026-05-23 23:15:50 +02:00
Carl Vitting 156f89ac0a vault backup: 2026-05-23 23:15:22 2026-05-23 23:15:22 +02:00
Carl Vitting a77b5af500 vault backup: 2026-05-23 23:12:38 2026-05-23 23:12:38 +02:00
carl 0fa308a51b Add TestFile 2026-05-23 23:06:03 +02:00