From c4f29a535359fe1ecdb8bec45596f40b02891cd1 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Wed, 4 Sep 2024 14:17:32 -0400
Subject: Resolve a few unresolved merge conflicts.
---
indra/llxml/tests/llcontrol_test.cpp | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
(limited to 'indra/llxml')
diff --git a/indra/llxml/tests/llcontrol_test.cpp b/indra/llxml/tests/llcontrol_test.cpp
index 4cb66a91fb..52c202bceb 100644
--- a/indra/llxml/tests/llcontrol_test.cpp
+++ b/indra/llxml/tests/llcontrol_test.cpp
@@ -134,16 +134,8 @@ namespace tut
LLControlGroup test_cg("foo3");
std::string temp_test_file = (mTestConfigDir + "setting_llsd_persist_temp.xml");
mCleanups.push_back(temp_test_file);
-<<<<<<< variant A
- mCG->saveToFile(temp_test_file.c_str(), TRUE);
- results = test_cg.loadFromFile(temp_test_file);
->>>>>>> variant B
mCG->saveToFile(temp_test_file.c_str(), true);
- results = test_cg.loadFromFile(temp_test_file.c_str());
-####### Ancestor
- mCG->saveToFile(temp_test_file.c_str(), TRUE);
- results = test_cg.loadFromFile(temp_test_file.c_str());
-======= end
+ results = test_cg.loadFromFile(temp_test_file);
//If we haven't changed any settings, then we shouldn't have any settings to load
ensure("number of non-persisted changed settings loaded", (results == 0));
}
--
cgit v1.2.3