From 6da97e96a82e4b7a64a6d46b712017fdfacfefee Mon Sep 17 00:00:00 2001
From: The <149513282+the9655a@users.noreply.github.com>
Date: Sun, 7 Jul 2024 10:54:35 +0100
Subject: [PATCH] Resolve conflicts

---
 STORAGE.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/STORAGE.md b/STORAGE.md
index 79b2964d1..fbe29e50b 100644
--- a/STORAGE.md
+++ b/STORAGE.md
@@ -419,7 +419,9 @@
 * [SteamGridDB](https://www.steamgriddb.com/)
 * [DevAssets](https://devassets.com/)
 * [Incern](https://www.incern.org/)
-* [GameDev Market](https://www.gamedevmarket.net/)
+* [GameDevAssets](https://www.gamedevmarket.net/category/3d/?type=free)
+* [xonotic](https://github.com/xonotic) - FPS Game Assets
+* [Warsow](https://github.com/Warsow) - FPS Game Assets
 
 ***