fixed conflicts

2026-01-30 15:31:52 +00:00 · 2024-03-19 23:57:43 +00:00
parent f03311be06 c5eef5a8f6
commit f7286ece55
39 changed files with 7852 additions and 652 deletions
@@ -2,7 +2,11 @@
                title: "innerknowing"
                tags: [Personal site,Modeller]
                externalUrl: "https://innerknowing.xyz/en/"
+<<<<<<< HEAD
                date: 9924-08-08
+=======
+                date: 9923-08-08
+>>>>>>> dev
                showDate: false
                showAuthor: false
                showReadingTime: false