correct merge error in llerror_test.cpp

1 files changed, 8 insertions, 0 deletions

diff --git a/indra/llcommon/tests/llerror_test.cpp b/indra/llcommon/tests/llerror_test.cpp
index 8084a05288..febfa782ca 100755
--- a/indra/llcommon/tests/llerror_test.cpp
+++ b/indra/llcommon/tests/llerror_test.cpp
@@ -39,6 +39,14 @@
 namespace
 {
 #   pragma clang diagnostic ignored "-Wunused-function"
+	void test_that_error_h_includes_enough_things_to_compile_a_message()
+	{
+		LL_INFOS() << "!" << LL_ENDL;
+	}
+}
+
+namespace
+{
 	static bool fatalWasCalled;
 	void fatalCall(const std::string&) { fatalWasCalled = true; }
 }