fixed conflicts

This commit is contained in:
Nuno Coração
2024-03-19 23:53:25 +00:00
parent e6a8167b11
commit f03311be06
322 changed files with 309 additions and 307 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.6 KiB

After

Width:  |  Height:  |  Size: 74 KiB

View File

@@ -1,8 +1,8 @@
---
title: "innerknowing"
tags: [Sito personale, Modellatore]
externalUrl: "https://innerknowing.xyz"
date: 9923-08-08
externalUrl: "https://innerknowing.xyz/en/"
date: 9924-08-08
showDate: false
showAuthor: false
showReadingTime: false

View File

@@ -1,8 +1,8 @@
---
title: "innerknowing"
tags: [個人サイト, モデラー]
externalUrl: "https://innerknowing.xyz"
date: 9923-08-08
externalUrl: "https://innerknowing.xyz/en/"
date: 9924-08-08
showDate: false
showAuthor: false
showReadingTime: false

View File

@@ -1,8 +1,8 @@
---
title: "innerknowing"
tags: [Personal site,Modeller]
externalUrl: "https://innerknowing.xyz"
date: 9923-08-08
externalUrl: "https://innerknowing.xyz/en/"
date: 9924-08-08
showDate: false
showAuthor: false
showReadingTime: false

View File

@@ -1,8 +1,8 @@
---
title: "innerknowing"
tags: [个人网站, 建模师]
externalUrl: "https://innerknowing.xyz"
date: 9923-08-08
externalUrl: "https://innerknowing.xyz/en/"
date: 9924-08-08
showDate: false
showAuthor: false
showReadingTime: false