fixed conflicts

2026-01-30 15:31:52 +00:00 · 2024-03-19 23:53:25 +00:00
parent e6a8167b11
commit f03311be06
322 changed files with 309 additions and 307 deletions
@@ -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
+