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.

After

Width:  |  Height:  |  Size: 45 KiB

@@ -0,0 +1,14 @@
---
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
showEdit: false
showLikes: false
showViews: false
layoutBackgroundHeaderSpace: false
---
@@ -0,0 +1,14 @@
---
title: "Adam Madej - Gameplay Animator"
tags: [ポートフォリオサイト, ブログ, 個人サイト]
externalUrl: "http://www.adammadej.com/"
date: 9920-08-08
showDate: false
showAuthor: false
showReadingTime: false
showEdit: false
showLikes: false
showViews: false
layoutBackgroundHeaderSpace: false
---
@@ -0,0 +1,13 @@
---
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
showEdit: false
showLikes: false
showViews: false
layoutBackgroundHeaderSpace: false
@@ -0,0 +1,14 @@
---
title: "Adam Madej - Gameplay Animator"
tags: [作品集网站, 博客, 个人网站]
externalUrl: "http://www.adammadej.com/"
date: 9920-08-08
showDate: false
showAuthor: false
showReadingTime: false
showEdit: false
showLikes: false
showViews: false
layoutBackgroundHeaderSpace: false
---