Fix merge

This commit is contained in:
Freddo 2021-08-17 18:53:57 +02:00 committed by GitHub
parent 5f7210be31
commit b0a21e5e63
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -87,8 +87,6 @@ If you are reading this it looks like you are looking to add an egg to your serv
[ET Legacy](game_eggs/enemy_territory/etlegacy)
[Factorio](/factorio/factorio)
[FTL: Tachyon](game_eggs/ftl/tachyon)
[Factorio](game_eggs/factorio)
@ -251,4 +249,4 @@ If you are reading this it looks like you are looking to add an egg to your serv
### Grafana
* [Grafana](/software/grafana)
### haste-server
* [haste-server](/software/haste-server)
* [haste-server](/software/haste-server)