diff options
author | Callum Prentice <callum@lindenlab.com> | 2023-02-13 14:12:59 -0800 |
---|---|---|
committer | Callum Prentice <callum@lindenlab.com> | 2023-02-13 14:12:59 -0800 |
commit | 422cd237dff521b35521292a8fccca61eaece23a (patch) | |
tree | ec275907b06d8839b2c6f984a0c7ad11719efc77 /doc/sl-logo-dark.png | |
parent | f3cd329b585ef55a66f2a824f010d1a54d67d8d2 (diff) | |
parent | 8d21d29bd7fa038db632ff90fb0e1207d0713ca2 (diff) |
Fix up a couple of tiny merge conflicts after a merge with main
Diffstat (limited to 'doc/sl-logo-dark.png')
-rw-r--r-- | doc/sl-logo-dark.png | bin | 0 -> 18028 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/doc/sl-logo-dark.png b/doc/sl-logo-dark.png Binary files differnew file mode 100644 index 0000000000..fa9ef32aea --- /dev/null +++ b/doc/sl-logo-dark.png |