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

6
common/countries/colors.txt
View file

@ -135,6 +135,7 @@ GCT = {
color_ui = rgb { 21 31 102 }
}
<<<<<<< Updated upstream
LSA = {
color = rgb { 232 212 192 }
color_ui = rgb { 232 212 192 }
@ -473,4 +474,9 @@ MOS = {
OST = {
color = rgb { 100 100 100 }
color_ui = rgb { 100 100 100 }
=======
FLA = {
color = rgb { 190 170 0 }
color_ui = rgb { 190 170 0 }
>>>>>>> Stashed changes
}