diff options
| author | Graham Linden <graham@lindenlab.com> | 2019-05-08 11:42:31 -0700 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2019-05-08 11:42:31 -0700 |
| commit | 605c9c19661702755171669e2af846abe77d2a51 (patch) | |
| tree | 8ab3bcd992c8167c1b9bdd9af074cd8acf39bcf7 /indra/newview/skins/default/xui/ja/floater_bulk_perms.xml | |
| parent | b5055e890743783746a3691f14b81a6bc62f2bff (diff) | |
Fix merge fail.
Diffstat (limited to 'indra/newview/skins/default/xui/ja/floater_bulk_perms.xml')
0 files changed, 0 insertions, 0 deletions