fixed conflicts

This commit is contained in:
Nuno Coração
2024-03-19 23:53:25 +00:00
parent e6a8167b11
commit f03311be06
322 changed files with 309 additions and 307 deletions

View File

@@ -80,14 +80,6 @@
"Personal site"
]
},
{
"title": "chris.banes.dev",
"url": "https://chris.banes.dev",
"source": "n/a",
"tags": [
"Personal site"
]
},
{
"title": "fahru.my.id",
"url": "https://www.fahru.my.id",
@@ -617,7 +609,7 @@
},
{
"title": "innerknowing",
"url": "https://innerknowing.xyz",
"url": "https://innerknowing.xyz/en/",
"source": "n/a",
"tags": [
"Personal site",
@@ -649,5 +641,15 @@
"tags": [
"Personal blog"
]
},
{
"title": "Adam Madej - Gameplay Animator",
"url": "http://www.adammadej.com/",
"source": "https://github.com/arahmitz/adamblogstuff",
"tags": [
"Portfolio Site",
"Blog",
"Personal Site"
]
}
]
]