fixed conflicts

exampleSite/content/users/Adam Madej - Gameplay Animator/index.it.md

@@ -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
+                ␍---
+

exampleSite/content/users/Adam Madej - Gameplay Animator/index.ja.md

@@ -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
+                ␍---
+

exampleSite/content/users/Adam Madej - Gameplay Animator/index.md

@@ -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
+                ␍---

exampleSite/content/users/Adam Madej - Gameplay Animator/index.zh-cn.md

@@ -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
+                ␍---
+