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

After

Width:  |  Height:  |  Size: 56 KiB

View file

@ -2,7 +2,7 @@
title: "50-nuances-octets.fr"
tags: [Sito dell'organizzazione]
externalUrl: "https://www.50-nuances-octets.fr/"
date: 9957-08-08
date: 9958-08-08
showDate: false
showAuthor: false
showReadingTime: false

View file

@ -2,7 +2,7 @@
title: "50-nuances-octets.fr"
tags: [組織サイト]
externalUrl: "https://www.50-nuances-octets.fr/"
date: 9957-08-08
date: 9958-08-08
showDate: false
showAuthor: false
showReadingTime: false

View file

@ -2,7 +2,7 @@
title: "50-nuances-octets.fr"
tags: [Organization site]
externalUrl: "https://www.50-nuances-octets.fr/"
date: 9957-08-08
date: 9958-08-08
showDate: false
showAuthor: false
showReadingTime: false

View file

@ -2,7 +2,7 @@
title: "50-nuances-octets.fr"
tags: [组织站点]
externalUrl: "https://www.50-nuances-octets.fr/"
date: 9957-08-08
date: 9958-08-08
showDate: false
showAuthor: false
showReadingTime: false

Binary file not shown.

After

Width:  |  Height:  |  Size: 45 KiB

View file

@ -1,8 +1,8 @@
---
title: "chris.banes.dev"
tags: [Sito personale]
externalUrl: "https://chris.banes.dev"
date: 9989-08-08
title: "Adam Madej - Gameplay Animator"
tags: [Sito portfolio, Blog, Sito personale]
externalUrl: "http://www.adammadej.com/"
date: 9920-08-08
showDate: false
showAuthor: false
showReadingTime: false

View file

@ -1,8 +1,8 @@
---
title: "chris.banes.dev"
tags: [個人サイト]
externalUrl: "https://chris.banes.dev"
date: 9989-08-08
title: "Adam Madej - Gameplay Animator"
tags: [ポートフォリオサイト, ブログ, 個人サイト]
externalUrl: "http://www.adammadej.com/"
date: 9920-08-08
showDate: false
showAuthor: false
showReadingTime: false

View file

@ -1,8 +1,8 @@
---
title: "chris.banes.dev"
tags: [Personal site]
externalUrl: "https://chris.banes.dev"
date: 9989-08-08
title: "Adam Madej - Gameplay Animator"
tags: [Portfolio Site,Blog,Personal Site]
externalUrl: "http://www.adammadej.com/"
date: 9920-08-08
showDate: false
showAuthor: false
showReadingTime: false

View file

@ -1,8 +1,8 @@
---
title: "chris.banes.dev"
tags: [个人网站]
externalUrl: "https://chris.banes.dev"
date: 9989-08-08
title: "Adam Madej - Gameplay Animator"
tags: [作品集网站, 博客, 个人网站]
externalUrl: "http://www.adammadej.com/"
date: 9920-08-08
showDate: false
showAuthor: false
showReadingTime: false

Binary file not shown.

Before

Width:  |  Height:  |  Size: 80 KiB

After

Width:  |  Height:  |  Size: 80 KiB

View file

@ -2,7 +2,7 @@
title: "BoringTech.net"
tags: [Sito personale, Blog]
externalUrl: "https://boringtech.net/"
date: 9935-08-08
date: 9936-08-08
showDate: false
showAuthor: false
showReadingTime: false

View file

@ -2,7 +2,7 @@
title: "BoringTech.net"
tags: [個人サイト, ブログ]
externalUrl: "https://boringtech.net/"
date: 9935-08-08
date: 9936-08-08
showDate: false
showAuthor: false
showReadingTime: false

View file

@ -2,7 +2,7 @@
title: "BoringTech.net"
tags: [Personal Site,Blog]
externalUrl: "https://boringtech.net/"
date: 9935-08-08
date: 9936-08-08
showDate: false
showAuthor: false
showReadingTime: false

View file

@ -2,7 +2,7 @@
title: "BoringTech.net"
tags: [个人网站, 博客]
externalUrl: "https://boringtech.net/"
date: 9935-08-08
date: 9936-08-08
showDate: false
showAuthor: false
showReadingTime: false

Binary file not shown.

Before

Width:  |  Height:  |  Size: 147 KiB

After

Width:  |  Height:  |  Size: 147 KiB

View file

@ -2,7 +2,7 @@
title: "DXPetti.com"
tags: [Sito personale, Blog]
externalUrl: "https://www.dxpetti.com/"
date: 9929-08-08
date: 9930-08-08
showDate: false
showAuthor: false
showReadingTime: false

View file

@ -2,7 +2,7 @@
title: "DXPetti.com"
tags: [個人サイト, ブログ]
externalUrl: "https://www.dxpetti.com/"
date: 9929-08-08
date: 9930-08-08
showDate: false
showAuthor: false
showReadingTime: false

View file

@ -2,7 +2,7 @@
title: "DXPetti.com"
tags: [Personal site,Blog]
externalUrl: "https://www.dxpetti.com/"
date: 9929-08-08
date: 9930-08-08
showDate: false
showAuthor: false
showReadingTime: false

View file

@ -2,7 +2,7 @@
title: "DXPetti.com"
tags: [个人网站, 博客]
externalUrl: "https://www.dxpetti.com/"
date: 9929-08-08
date: 9930-08-08
showDate: false
showAuthor: false
showReadingTime: false

Binary file not shown.

Before

Width:  |  Height:  |  Size: 74 KiB

After

Width:  |  Height:  |  Size: 74 KiB

View file

@ -2,7 +2,7 @@
title: "Mare_Infinitus"
tags: [Sito personale, Blog]
externalUrl: "https://lab.imgb.space"
date: 9922-08-08
date: 9923-08-08
showDate: false
showAuthor: false
showReadingTime: false

View file

@ -2,7 +2,7 @@
title: "Mare_Infinitus"
tags: [個人サイト, ブログ]
externalUrl: "https://lab.imgb.space"
date: 9922-08-08
date: 9923-08-08
showDate: false
showAuthor: false
showReadingTime: false

View file

@ -2,7 +2,7 @@
title: "Mare_Infinitus"
tags: [Personal Site,Blog]
externalUrl: "https://lab.imgb.space"
date: 9922-08-08
date: 9923-08-08
showDate: false
showAuthor: false
showReadingTime: false

View file

@ -2,7 +2,7 @@
title: "Mare_Infinitus"
tags: [个人网站, 博客]
externalUrl: "https://lab.imgb.space"
date: 9922-08-08
date: 9923-08-08
showDate: false
showAuthor: false
showReadingTime: false

View file

@ -2,7 +2,7 @@
title: "aakashnand.com"
tags: [Sito personale]
externalUrl: "https://aakashnand.com/"
date: 9924-08-08
date: 9925-08-08
showDate: false
showAuthor: false
showReadingTime: false

View file

@ -2,7 +2,7 @@
title: "aakashnand.com"
tags: [個人サイト]
externalUrl: "https://aakashnand.com/"
date: 9924-08-08
date: 9925-08-08
showDate: false
showAuthor: false
showReadingTime: false

View file

@ -2,7 +2,7 @@
title: "aakashnand.com"
tags: [Personal site]
externalUrl: "https://aakashnand.com/"
date: 9924-08-08
date: 9925-08-08
showDate: false
showAuthor: false
showReadingTime: false

View file

@ -2,7 +2,7 @@
title: "aakashnand.com"
tags: [个人网站]
externalUrl: "https://aakashnand.com/"
date: 9924-08-08
date: 9925-08-08
showDate: false
showAuthor: false
showReadingTime: false

View file

@ -2,7 +2,7 @@
title: "adilhyz.github.io"
tags: [Sito personale]
externalUrl: "https://adilhyz.github.io"
date: 9945-08-08
date: 9946-08-08
showDate: false
showAuthor: false
showReadingTime: false

View file

@ -2,7 +2,7 @@
title: "adilhyz.github.io"
tags: [個人サイト]
externalUrl: "https://adilhyz.github.io"
date: 9945-08-08
date: 9946-08-08
showDate: false
showAuthor: false
showReadingTime: false

View file

@ -2,7 +2,7 @@
title: "adilhyz.github.io"
tags: [Personal site]
externalUrl: "https://adilhyz.github.io"
date: 9945-08-08
date: 9946-08-08
showDate: false
showAuthor: false
showReadingTime: false

View file

@ -2,7 +2,7 @@
title: "adilhyz.github.io"
tags: [个人网站]
externalUrl: "https://adilhyz.github.io"
date: 9945-08-08
date: 9946-08-08
showDate: false
showAuthor: false
showReadingTime: false

Binary file not shown.

Before

Width:  |  Height:  |  Size: 72 KiB

After

Width:  |  Height:  |  Size: 72 KiB

View file

@ -2,7 +2,7 @@
title: "adir1.com"
tags: [Sito personale]
externalUrl: "https://adir1.com/"
date: 9976-08-08
date: 9977-08-08
showDate: false
showAuthor: false
showReadingTime: false

View file

@ -2,7 +2,7 @@
title: "adir1.com"
tags: [個人サイト]
externalUrl: "https://adir1.com/"
date: 9976-08-08
date: 9977-08-08
showDate: false
showAuthor: false
showReadingTime: false

View file

@ -2,7 +2,7 @@
title: "adir1.com"
tags: [Personal site]
externalUrl: "https://adir1.com/"
date: 9976-08-08
date: 9977-08-08
showDate: false
showAuthor: false
showReadingTime: false

View file

@ -2,7 +2,7 @@
title: "adir1.com"
tags: [个人网站]
externalUrl: "https://adir1.com/"
date: 9976-08-08
date: 9977-08-08
showDate: false
showAuthor: false
showReadingTime: false

View file

@ -2,7 +2,7 @@
title: "alanctanner.com"
tags: [Sito personale]
externalUrl: "https://alanctanner.com/"
date: 9965-08-08
date: 9966-08-08
showDate: false
showAuthor: false
showReadingTime: false

View file

@ -2,7 +2,7 @@
title: "alanctanner.com"
tags: [個人サイト]
externalUrl: "https://alanctanner.com/"
date: 9965-08-08
date: 9966-08-08
showDate: false
showAuthor: false
showReadingTime: false

View file

@ -2,7 +2,7 @@
title: "alanctanner.com"
tags: [Personal site]
externalUrl: "https://alanctanner.com/"
date: 9965-08-08
date: 9966-08-08
showDate: false
showAuthor: false
showReadingTime: false

View file

@ -2,7 +2,7 @@
title: "alanctanner.com"
tags: [个人网站]
externalUrl: "https://alanctanner.com/"
date: 9965-08-08
date: 9966-08-08
showDate: false
showAuthor: false
showReadingTime: false

Binary file not shown.

Before

Width:  |  Height:  |  Size: 57 KiB

After

Width:  |  Height:  |  Size: 57 KiB

View file

@ -2,7 +2,7 @@
title: "alejandro-ao.com"
tags: [Sito personale]
externalUrl: "https://alejandro-ao.com/"
date: 9977-08-08
date: 9978-08-08
showDate: false
showAuthor: false
showReadingTime: false

View file

@ -2,7 +2,7 @@
title: "alejandro-ao.com"
tags: [個人サイト]
externalUrl: "https://alejandro-ao.com/"
date: 9977-08-08
date: 9978-08-08
showDate: false
showAuthor: false
showReadingTime: false

View file

@ -2,7 +2,7 @@
title: "alejandro-ao.com"
tags: [Personal site]
externalUrl: "https://alejandro-ao.com/"
date: 9977-08-08
date: 9978-08-08
showDate: false
showAuthor: false
showReadingTime: false

View file

@ -2,7 +2,7 @@
title: "alejandro-ao.com"
tags: [个人网站]
externalUrl: "https://alejandro-ao.com/"
date: 9977-08-08
date: 9978-08-08
showDate: false
showAuthor: false
showReadingTime: false

View file

@ -2,7 +2,7 @@
title: "alxhslm.github.io"
tags: [Sito personale]
externalUrl: "https://alxhslm.github.io/"
date: 9932-08-08
date: 9933-08-08
showDate: false
showAuthor: false
showReadingTime: false

View file

@ -2,7 +2,7 @@
title: "alxhslm.github.io"
tags: [個人サイト]
externalUrl: "https://alxhslm.github.io/"
date: 9932-08-08
date: 9933-08-08
showDate: false
showAuthor: false
showReadingTime: false

View file

@ -2,7 +2,7 @@
title: "alxhslm.github.io"
tags: [Personal Site]
externalUrl: "https://alxhslm.github.io/"
date: 9932-08-08
date: 9933-08-08
showDate: false
showAuthor: false
showReadingTime: false

View file

@ -2,7 +2,7 @@
title: "alxhslm.github.io"
tags: [个人网站]
externalUrl: "https://alxhslm.github.io/"
date: 9932-08-08
date: 9933-08-08
showDate: false
showAuthor: false
showReadingTime: false

Binary file not shown.

Before

Width:  |  Height:  |  Size: 75 KiB

After

Width:  |  Height:  |  Size: 71 KiB

View file

@ -2,7 +2,7 @@
title: "asterisk.lol"
tags: [Blog, Sito personale]
externalUrl: "https://asterisk.lol"
date: 9928-08-08
date: 9929-08-08
showDate: false
showAuthor: false
showReadingTime: false

View file

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

View file

@ -2,7 +2,7 @@
title: "asterisk.lol"
tags: [Blog,Personal Site]
externalUrl: "https://asterisk.lol"
date: 9928-08-08
date: 9929-08-08
showDate: false
showAuthor: false
showReadingTime: false

View file

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

Binary file not shown.

Before

Width:  |  Height:  |  Size: 115 KiB

After

Width:  |  Height:  |  Size: 115 KiB

View file

@ -2,7 +2,7 @@
title: "bbagwang.com"
tags: [Sito personale]
externalUrl: "https://bbagwang.com"
date: 9951-08-08
date: 9952-08-08
showDate: false
showAuthor: false
showReadingTime: false

View file

@ -2,7 +2,7 @@
title: "bbagwang.com"
tags: [個人サイト]
externalUrl: "https://bbagwang.com"
date: 9951-08-08
date: 9952-08-08
showDate: false
showAuthor: false
showReadingTime: false

View file

@ -2,7 +2,7 @@
title: "bbagwang.com"
tags: [Personal site]
externalUrl: "https://bbagwang.com"
date: 9951-08-08
date: 9952-08-08
showDate: false
showAuthor: false
showReadingTime: false

View file

@ -2,7 +2,7 @@
title: "bbagwang.com"
tags: [个人网站]
externalUrl: "https://bbagwang.com"
date: 9951-08-08
date: 9952-08-08
showDate: false
showAuthor: false
showReadingTime: false

Binary file not shown.

Before

Width:  |  Height:  |  Size: 92 KiB

After

Width:  |  Height:  |  Size: 89 KiB

View file

@ -2,7 +2,7 @@
title: "binarydigit.cafe"
tags: [Sito personale]
externalUrl: "https://binarydigit.cafe/"
date: 9933-08-08
date: 9934-08-08
showDate: false
showAuthor: false
showReadingTime: false

View file

@ -2,7 +2,7 @@
title: "binarydigit.cafe"
tags: [個人サイト]
externalUrl: "https://binarydigit.cafe/"
date: 9933-08-08
date: 9934-08-08
showDate: false
showAuthor: false
showReadingTime: false

View file

@ -2,7 +2,7 @@
title: "binarydigit.cafe"
tags: [Personal site]
externalUrl: "https://binarydigit.cafe/"
date: 9933-08-08
date: 9934-08-08
showDate: false
showAuthor: false
showReadingTime: false

View file

@ -2,7 +2,7 @@
title: "binarydigit.cafe"
tags: [个人网站]
externalUrl: "https://binarydigit.cafe/"
date: 9933-08-08
date: 9934-08-08
showDate: false
showAuthor: false
showReadingTime: false

View file

@ -2,7 +2,7 @@
title: "blastomussa.dev"
tags: [Sito personale]
externalUrl: "https://blastomussa.dev"
date: 9983-08-08
date: 9984-08-08
showDate: false
showAuthor: false
showReadingTime: false

View file

@ -2,7 +2,7 @@
title: "blastomussa.dev"
tags: [個人サイト]
externalUrl: "https://blastomussa.dev"
date: 9983-08-08
date: 9984-08-08
showDate: false
showAuthor: false
showReadingTime: false

View file

@ -2,7 +2,7 @@
title: "blastomussa.dev"
tags: [Personal site]
externalUrl: "https://blastomussa.dev"
date: 9983-08-08
date: 9984-08-08
showDate: false
showAuthor: false
showReadingTime: false

View file

@ -2,7 +2,7 @@
title: "blastomussa.dev"
tags: [个人网站]
externalUrl: "https://blastomussa.dev"
date: 9983-08-08
date: 9984-08-08
showDate: false
showAuthor: false
showReadingTime: false

Binary file not shown.

Before

Width:  |  Height:  |  Size: 80 KiB

After

Width:  |  Height:  |  Size: 84 KiB

View file

@ -2,7 +2,7 @@
title: "blog.enmanuelmoreira.com"
tags: [Sito personale]
externalUrl: "https://blog.enmanuelmoreira.com"
date: 9959-08-08
date: 9960-08-08
showDate: false
showAuthor: false
showReadingTime: false

View file

@ -2,7 +2,7 @@
title: "blog.enmanuelmoreira.com"
tags: [個人サイト]
externalUrl: "https://blog.enmanuelmoreira.com"
date: 9959-08-08
date: 9960-08-08
showDate: false
showAuthor: false
showReadingTime: false

View file

@ -2,7 +2,7 @@
title: "blog.enmanuelmoreira.com"
tags: [Personal site]
externalUrl: "https://blog.enmanuelmoreira.com"
date: 9959-08-08
date: 9960-08-08
showDate: false
showAuthor: false
showReadingTime: false

View file

@ -2,7 +2,7 @@
title: "blog.enmanuelmoreira.com"
tags: [个人网站]
externalUrl: "https://blog.enmanuelmoreira.com"
date: 9959-08-08
date: 9960-08-08
showDate: false
showAuthor: false
showReadingTime: false

View file

@ -2,7 +2,7 @@
title: "blog.muffn.io"
tags: [Sito personale]
externalUrl: "https://blog.muffn.io/"
date: 9974-08-08
date: 9975-08-08
showDate: false
showAuthor: false
showReadingTime: false

View file

@ -2,7 +2,7 @@
title: "blog.muffn.io"
tags: [個人サイト]
externalUrl: "https://blog.muffn.io/"
date: 9974-08-08
date: 9975-08-08
showDate: false
showAuthor: false
showReadingTime: false

View file

@ -2,7 +2,7 @@
title: "blog.muffn.io"
tags: [Personal site]
externalUrl: "https://blog.muffn.io/"
date: 9974-08-08
date: 9975-08-08
showDate: false
showAuthor: false
showReadingTime: false

View file

@ -2,7 +2,7 @@
title: "blog.muffn.io"
tags: [个人网站]
externalUrl: "https://blog.muffn.io/"
date: 9974-08-08
date: 9975-08-08
showDate: false
showAuthor: false
showReadingTime: false

View file

@ -2,7 +2,7 @@
title: "blog.stonegarden.dev"
tags: [Sito personale]
externalUrl: "https://blog.stonegarden.dev/"
date: 9937-08-08
date: 9938-08-08
showDate: false
showAuthor: false
showReadingTime: false

View file

@ -2,7 +2,7 @@
title: "blog.stonegarden.dev"
tags: [個人サイト]
externalUrl: "https://blog.stonegarden.dev/"
date: 9937-08-08
date: 9938-08-08
showDate: false
showAuthor: false
showReadingTime: false

View file

@ -2,7 +2,7 @@
title: "blog.stonegarden.dev"
tags: [Personal Site]
externalUrl: "https://blog.stonegarden.dev/"
date: 9937-08-08
date: 9938-08-08
showDate: false
showAuthor: false
showReadingTime: false

View file

@ -2,7 +2,7 @@
title: "blog.stonegarden.dev"
tags: [个人网站]
externalUrl: "https://blog.stonegarden.dev/"
date: 9937-08-08
date: 9938-08-08
showDate: false
showAuthor: false
showReadingTime: false

Binary file not shown.

Before

Width:  |  Height:  |  Size: 20 KiB

After

Width:  |  Height:  |  Size: 66 KiB

View file

@ -2,7 +2,7 @@
title: "cdell.io"
tags: [Sito personale]
externalUrl: "https://cdell.io"
date: 9982-08-08
date: 9983-08-08
showDate: false
showAuthor: false
showReadingTime: false

View file

@ -2,7 +2,7 @@
title: "cdell.io"
tags: [個人サイト]
externalUrl: "https://cdell.io"
date: 9982-08-08
date: 9983-08-08
showDate: false
showAuthor: false
showReadingTime: false

View file

@ -2,7 +2,7 @@
title: "cdell.io"
tags: [Personal site]
externalUrl: "https://cdell.io"
date: 9982-08-08
date: 9983-08-08
showDate: false
showAuthor: false
showReadingTime: false

View file

@ -2,7 +2,7 @@
title: "cdell.io"
tags: [个人网站]
externalUrl: "https://cdell.io"
date: 9982-08-08
date: 9983-08-08
showDate: false
showAuthor: false
showReadingTime: false

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 120 KiB

After

Width:  |  Height:  |  Size: 120 KiB

View file

@ -2,7 +2,7 @@
title: "clemsau.com"
tags: [Sito personale]
externalUrl: "https://clemsau.com/"
date: 9963-08-08
date: 9964-08-08
showDate: false
showAuthor: false
showReadingTime: false

View file

@ -2,7 +2,7 @@
title: "clemsau.com"
tags: [個人サイト]
externalUrl: "https://clemsau.com/"
date: 9963-08-08
date: 9964-08-08
showDate: false
showAuthor: false
showReadingTime: false

View file

@ -2,7 +2,7 @@
title: "clemsau.com"
tags: [Personal site]
externalUrl: "https://clemsau.com/"
date: 9963-08-08
date: 9964-08-08
showDate: false
showAuthor: false
showReadingTime: false

View file

@ -2,7 +2,7 @@
title: "clemsau.com"
tags: [个人网站]
externalUrl: "https://clemsau.com/"
date: 9963-08-08
date: 9964-08-08
showDate: false
showAuthor: false
showReadingTime: false

Binary file not shown.

Before

Width:  |  Height:  |  Size: 70 KiB

After

Width:  |  Height:  |  Size: 93 KiB

View file

@ -2,7 +2,7 @@
title: "datatodroids.tech"
tags: [Sito personale, Blog]
externalUrl: "https://datatodroids.tech/"
date: 9930-08-08
date: 9931-08-08
showDate: false
showAuthor: false
showReadingTime: false

View file

@ -2,7 +2,7 @@
title: "datatodroids.tech"
tags: [個人サイト, ブログ]
externalUrl: "https://datatodroids.tech/"
date: 9930-08-08
date: 9931-08-08
showDate: false
showAuthor: false
showReadingTime: false

View file

@ -2,7 +2,7 @@
title: "datatodroids.tech"
tags: [Personal site,Blog]
externalUrl: "https://datatodroids.tech/"
date: 9930-08-08
date: 9931-08-08
showDate: false
showAuthor: false
showReadingTime: false

View file

@ -2,7 +2,7 @@
title: "datatodroids.tech"
tags: [个人网站, 博客]
externalUrl: "https://datatodroids.tech/"
date: 9930-08-08
date: 9931-08-08
showDate: false
showAuthor: false
showReadingTime: false

Binary file not shown.

Before

Width:  |  Height:  |  Size: 45 KiB

After

Width:  |  Height:  |  Size: 42 KiB

Some files were not shown because too many files have changed in this diff Show more