SL-16094: Stylish braces!

(cherry picked from commit 18de6c9b98)
2021-11-11 10:23:16 -05:00 · 2021-11-11 10:23:16 -05:00 · f997bcd186
parent 106d52c6ee
commit f997bcd186
1 changed files with 7 additions and 0 deletions
--- a/indra/llcommon/llsingleton.h
+++ b/indra/llcommon/llsingleton.h
@ -859,9 +859,16 @@ 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!)
    }
 };