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

After

Width:  |  Height:  |  Size: 75 KiB

@@ -2,7 +2,7 @@
title: "technicat.com"
tags: [Sito aziendale]
externalUrl: "https://technicat.com/"
date: 9969-08-08
date: 9970-08-08
showDate: false
showAuthor: false
showReadingTime: false
@@ -2,7 +2,7 @@
title: "technicat.com"
tags: [企業サイト]
externalUrl: "https://technicat.com/"
date: 9969-08-08
date: 9970-08-08
showDate: false
showAuthor: false
showReadingTime: false
@@ -2,7 +2,7 @@
title: "technicat.com"
tags: [Company site]
externalUrl: "https://technicat.com/"
date: 9969-08-08
date: 9970-08-08
showDate: false
showAuthor: false
showReadingTime: false
@@ -2,7 +2,7 @@
title: "technicat.com"
tags: [公司网站]
externalUrl: "https://technicat.com/"
date: 9969-08-08
date: 9970-08-08
showDate: false
showAuthor: false
showReadingTime: false