diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2021-11-19 14:57:36 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2021-11-19 14:57:36 -0500 |
| commit | 3171aaad9b1f2757f8b0d8cbb784a45a7bbebafa (patch) | |
| tree | a775059871abbf95392ffe2f6ce045a299524280 /indra/newview/app_settings/settings.xml | |
| parent | f997bcd186d00e30132f32be007bb3978bf3a8f5 (diff) | |
SL-16094: fix merge glitch
Diffstat (limited to 'indra/newview/app_settings/settings.xml')
0 files changed, 0 insertions, 0 deletions