Hannah/Years-Gone-By
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge oopsie

Browse source
This commit is contained in:
lilylindstrand 2024-09-27 18:50:58 +02:00
commit 375946b367
7 changed files with 55 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
localisation/english/countries_l_english.yml
View file

@ -1139,3 +1139,11 @@ AUU_communism_DEF:0 "Auvurgen"
AUU_fascism:0 "Auvurgen"
AUU_fascism_DEF:0 "Auvurgen"
<<<<<<< Updated upstream
=======
GCT_neutrality:0 "Günther Cult"
GCT_neutrality_DEF:0 "The cult of Günther"
FLA_neutrality:0 "flanders"
FLA_neutrality_DEF:0 "The Kingdom of Flanders"
>>>>>>> Stashed changes