fixed conflicts

This commit is contained in:
Nuno Coração committed 2024-03-19 23:57:43 +00:00
commit f7286ece55
39 files changed
+7852 -652

No files matched your search

@@ -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