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 /indra/llfilesystem/lldir_utils_objc.h | |
| parent | f3cd329b585ef55a66f2a824f010d1a54d67d8d2 (diff) | |
| parent | 8d21d29bd7fa038db632ff90fb0e1207d0713ca2 (diff) | |
Fix up a couple of tiny merge conflicts after a merge with main
Diffstat (limited to 'indra/llfilesystem/lldir_utils_objc.h')
| -rw-r--r-- | indra/llfilesystem/lldir_utils_objc.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/llfilesystem/lldir_utils_objc.h b/indra/llfilesystem/lldir_utils_objc.h index 12019c4284..59dbeb4aec 100644 --- a/indra/llfilesystem/lldir_utils_objc.h +++ b/indra/llfilesystem/lldir_utils_objc.h @@ -33,11 +33,11 @@ #include <iostream> -std::string* getSystemTempFolder(); -std::string* getSystemCacheFolder(); -std::string* getSystemApplicationSupportFolder(); -std::string* getSystemResourceFolder(); -std::string* getSystemExecutableFolder(); +std::string getSystemTempFolder(); +std::string getSystemCacheFolder(); +std::string getSystemApplicationSupportFolder(); +std::string getSystemResourceFolder(); +std::string getSystemExecutableFolder(); #endif // LL_LLDIR_UTILS_OBJC_H |