SL-16094: fix merge glitch

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!)
     }
 };