diff options
| author | Callum Prentice <callum@lindenlab.com> | 2023-07-18 10:51:51 -0700 |
|---|---|---|
| committer | Callum Prentice <callum@lindenlab.com> | 2023-07-18 10:51:51 -0700 |
| commit | c5d7f3c4c1cf37ca0e68bbe9830bd3f3931476e5 (patch) | |
| tree | c2af269fd56c04bb9ddca3d99a0cd68ab9d6c94e /indra/newview/skins/default/textures/icons/profile_badge_linden.png | |
| parent | 1fe007abef6eeceefb0dc720b4a5ecb4505ede88 (diff) | |
| parent | ec4135da63a3f3877222fba4ecb59b15650371fe (diff) | |
DRTVWR-489: trivial merge conflict fix
Diffstat (limited to 'indra/newview/skins/default/textures/icons/profile_badge_linden.png')
| -rw-r--r-- | indra/newview/skins/default/textures/icons/profile_badge_linden.png | bin | 0 -> 3521 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/indra/newview/skins/default/textures/icons/profile_badge_linden.png b/indra/newview/skins/default/textures/icons/profile_badge_linden.png Binary files differnew file mode 100644 index 0000000000..1b6ac03e86 --- /dev/null +++ b/indra/newview/skins/default/textures/icons/profile_badge_linden.png |