dbrun/blowfish
1
0
Fork 0
mirror of https://github.com/nunocoracao/blowfish.git synced 2026-01-30 15:31:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed conflicts

Browse Source
This commit is contained in:
Nuno Coração
2024-03-20 00:01:29 +00:00
parent f7286ece55
commit c516d2ef6e
37 changed files with 8 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
exampleSite/content/users/Adam Madej - Gameplay Animator/index.md
-18
View File
@@ -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
=======