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: 92 KiB

After

Width:  |  Height:  |  Size: 93 KiB

View File

@@ -2,7 +2,7 @@
title: "notes.bluesdriveamelia.space"
tags: [Blog, Sito personale]
externalUrl: "https://notes.bluesdriveamelia.space/"
date: 9927-08-08
date: 9928-08-08
showDate: false
showAuthor: false
showReadingTime: false

View File

@@ -2,7 +2,7 @@
title: "notes.bluesdriveamelia.space"
tags: [ブログ, 個人サイト]
externalUrl: "https://notes.bluesdriveamelia.space/"
date: 9927-08-08
date: 9928-08-08
showDate: false
showAuthor: false
showReadingTime: false

View File

@@ -2,7 +2,7 @@
title: "notes.bluesdriveamelia.space"
tags: [Blog,Personal site]
externalUrl: "https://notes.bluesdriveamelia.space/"
date: 9927-08-08
date: 9928-08-08
showDate: false
showAuthor: false
showReadingTime: false

View File

@@ -2,7 +2,7 @@
title: "notes.bluesdriveamelia.space"
tags: [博客, 个人网站]
externalUrl: "https://notes.bluesdriveamelia.space/"
date: 9927-08-08
date: 9928-08-08
showDate: false
showAuthor: false
showReadingTime: false