fixed conflicts

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

No files matched your search

Binary file not shown.

Before

Width:  |  Height:  |  Size: 62 KiB

After

Width:  |  Height:  |  Size: 62 KiB

@@ -2,7 +2,7 @@
title: "sdehm.dev"
tags: [Sito personale]
externalUrl: "https://sdehm.dev"
date: 9979-08-08
date: 9980-08-08
showDate: false
showAuthor: false
showReadingTime: false
@@ -2,7 +2,7 @@
title: "sdehm.dev"
tags: [個人サイト]
externalUrl: "https://sdehm.dev"
date: 9979-08-08
date: 9980-08-08
showDate: false
showAuthor: false
showReadingTime: false
+1 -1
View File
@@ -2,7 +2,7 @@
title: "sdehm.dev"
tags: [Personal site]
externalUrl: "https://sdehm.dev"
date: 9979-08-08
date: 9980-08-08
showDate: false
showAuthor: false
showReadingTime: false
@@ -2,7 +2,7 @@
title: "sdehm.dev"
tags: [个人网站]
externalUrl: "https://sdehm.dev"
date: 9979-08-08
date: 9980-08-08
showDate: false
showAuthor: false
showReadingTime: false