fixed conflicts

This commit is contained in:
Nuno Coração committed 2024-03-20 00:01:29 +00:00
1 parent f7286ece55
commit c516d2ef6e
37 files changed
+8 -37

No files matched your search

@@ -2,11 +2,7 @@
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