SL-16094: fix merge glitch

2021-11-19 14:57:36 -05:00 · 2021-11-19 14:57:36 -05:00 · 3171aaad9b
parent f997bcd186
commit 3171aaad9b
1 changed files with 0 additions and 6 deletions
--- 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!)
    }
 };