diff options
author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-04-10 06:57:52 +0300 |
---|---|---|
committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-04-10 07:08:25 +0300 |
commit | 84dfe55810815e8c274044cea5c81aaed89a787f (patch) | |
tree | 4e499acfe5617682c5eca52998b5c10cdac8609a /indra/newview/skins/default/xui/en/floater_land_holdings.xml | |
parent | 16e638db975278f6018fe1e21ba1954b7f159149 (diff) | |
parent | da9a1dcb55548a249ff7a1255f3e518696b81245 (diff) |
Merge branch 'main' into marchcat/y-merge
# Conflicts:
# autobuild.xml
# indra/llcommon/llsys.cpp
Diffstat (limited to 'indra/newview/skins/default/xui/en/floater_land_holdings.xml')
-rw-r--r-- | indra/newview/skins/default/xui/en/floater_land_holdings.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_land_holdings.xml b/indra/newview/skins/default/xui/en/floater_land_holdings.xml index 390ec9ab7d..affd2b196d 100644 --- a/indra/newview/skins/default/xui/en/floater_land_holdings.xml +++ b/indra/newview/skins/default/xui/en/floater_land_holdings.xml @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater positioning="centered" legacy_header_height="18" |