From f997bcd186d00e30132f32be007bb3978bf3a8f5 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Thu, 11 Nov 2021 10:23:16 -0500
Subject: SL-16094: Stylish braces!

(cherry picked from commit 18de6c9b989cc7060f2a314f5b68cc102677823b)
---
 indra/llcommon/llsingleton.h | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'indra/llcommon')

diff --git a/indra/llcommon/llsingleton.h b/indra/llcommon/llsingleton.h
index 24d01812c9..da2d6fd984 100644
--- 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!)
     }
 };
 
-- 
cgit v1.2.3