Resolve conflicts

This commit is contained in:
The 2024-07-07 10:54:35 +01:00 committed by GitHub
parent c79d6f3111
commit 6da97e96a8
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -419,7 +419,9 @@
* [SteamGridDB](https://www.steamgriddb.com/) * [SteamGridDB](https://www.steamgriddb.com/)
* [DevAssets](https://devassets.com/) * [DevAssets](https://devassets.com/)
* [Incern](https://www.incern.org/) * [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
*** ***