fixed conflicts

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

@@ -1,22 +1,8 @@
 ---
-<<<<<<< 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
@@ -25,7 +11,3 @@
                 showViews: false
                 layoutBackgroundHeaderSpace: false
                 
---
-<<<<<<< HEAD
-=======
-
->>>>>>> dev

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

@@ -1,15 +1,8 @@
 ---
-<<<<<<<< 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,11 +2,7 @@
                 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

processUsers.js

@@ -125,15 +125,15 @@ puppeteer
 
             if (!fs.existsSync(dir)) {
                 fs.mkdirSync(dir);
-                console.log(i, users[i].title);
-                fs.writeFileSync(dir + '/index.md', userMDFile);
-                for (var j in targetLangs) {
-                    var content = await translateFrontMatterTags(userMDFile, targetLangs[j], users[i].tags);
-                    fs.writeFileSync(dir + '/index.' + targetLangs[j] + '.md', content);
-                }
-                await page.goto(users[i].url);
-                await page.screenshot({ path: dir + "/feature.jpg" });
             }
+            console.log(i, users[i].title);
+            fs.writeFileSync(dir + '/index.md', userMDFile);
+            for (var j in targetLangs) {
+                var content = await translateFrontMatterTags(userMDFile, targetLangs[j], users[i].tags);
+                fs.writeFileSync(dir + '/index.' + targetLangs[j] + '.md', content);
+            }
+            await page.goto(users[i].url);
+            await page.screenshot({ path: dir + "/feature.jpg" });
         }
 
         await browser.close();