fixed conflicts

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

@@ -1,8 +1,22 @@
 ---
+<<<<<<< HEAD
                 title: "Adam Madej - Gameplay Animator"
                 tags: [Portfolio Site,Blog,Personal Site]
                 externalUrl: "http://www.adammadej.com/"
                 date: 9920-08-08
+=======
+<<<<<<<< HEAD:exampleSite/content/users/fahru.my.id/index.it.md
+                title: "fahru.my.id"
+                tags: [Sito personale]
+                externalUrl: "https://www.fahru.my.id"
+                date: 9989-08-08
+========
+                title: "Adam Madej - Gameplay Animator"
+                tags: [Portfolio Site,Blog,Personal Site]
+                externalUrl: "http://www.adammadej.com/"
+                date: 9919-08-08
+>>>>>>>> dev:exampleSite/content/users/Adam Madej - Gameplay Animator/index.md
+>>>>>>> dev
                 showDate: false
                 showAuthor: false
                 showReadingTime: false
@@ -11,3 +25,7 @@
                 showViews: false
                 layoutBackgroundHeaderSpace: false
                 
+---
+<<<<<<< HEAD
+=======
+

exampleSite/content/users/_index.md

@@ -10,7 +10,7 @@ showAuthor: false
 showReadingTime: false
 showEdit: false
 layoutBackgroundHeaderSpace: false
-cardViewScreenWidth: true
+cardViewScreenWidth: false
 ---
  
 

exampleSite/content/users/fahru.my.id/index.it.md

@@ -1,8 +1,15 @@
 ---
+<<<<<<<< HEAD:exampleSite/content/users/fahru.my.id/index.it.md
                 title: "fahru.my.id"
                 tags: [Sito personale]
                 externalUrl: "https://www.fahru.my.id"
                 date: 9989-08-08
+========
+                title: "Adam Madej - Gameplay Animator"
+                tags: [Portfolio Site,Blog,Personal Site]
+                externalUrl: "http://www.adammadej.com/"
+                date: 9919-08-08
+>>>>>>>> dev:exampleSite/content/users/Adam Madej - Gameplay Animator/index.md
                 showDate: false
                 showAuthor: false
                 showReadingTime: false

exampleSite/content/users/innerknowing/index.md

@@ -2,7 +2,11 @@
                 title: "innerknowing"
                 tags: [Personal site,Modeller]
                 externalUrl: "https://innerknowing.xyz/en/"
+<<<<<<< HEAD
                 date: 9924-08-08
+=======
+                date: 9923-08-08
+>>>>>>> dev
                 showDate: false
                 showAuthor: false
                 showReadingTime: false