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 | |
| parent | f997bcd186d00e30132f32be007bb3978bf3a8f5 (diff) | |
SL-16094: fix merge glitch
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llcommon/llsingleton.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/indra/llcommon/llsingleton.h b/indra/llcommon/llsingleton.h index da2d6fd984..f85f961287 100644 --- a/indra/llcommon/llsingleton.h +++ b/indra/llcommon/llsingleton.h @@ -859,16 +859,10 @@ public: static inline T& instance() { return *getInstance(); } static inline bool instanceExists() { return sInstance != nullptr; } -<<<<<<< HEAD - static void deleteSingleton() { - delete sInstance; - sInstance = nullptr; -======= static void deleteSingleton() { delete sInstance; sInstance = nullptr; ->>>>>>> 18de6c9b98 (SL-16094: Stylish braces!) } }; |