From 7a5ef6cec95532655577ead42337d03d2b66f21c Mon Sep 17 00:00:00 2001 From: Maxim Mamontov Date: Tue, 5 Feb 2013 21:14:35 +0200 Subject: [PATCH 1/1] Removed merge artifacts. --- stglibs/conffiles.lib/conffiles.cpp | 6 ------ 1 file changed, 6 deletions(-) diff --git a/stglibs/conffiles.lib/conffiles.cpp b/stglibs/conffiles.lib/conffiles.cpp index 4fb72f61..302c3651 100644 --- a/stglibs/conffiles.lib/conffiles.cpp +++ b/stglibs/conffiles.lib/conffiles.cpp @@ -73,7 +73,6 @@ std::string Trim(std::string val) { return TrimR(TrimL(val)); } -} //--------------------------------------------------------------------------- } // namespace anonymous @@ -115,13 +114,8 @@ while (getline(f, line)) return; } -<<<<<<< Updated upstream std::string parameter = Trim(line.substr(0, pos)); std::string value = Trim(line.substr(pos + 1)); -======= - std::string parameter = line.substr(0, pos); - std::string value = line.substr(pos + 1); ->>>>>>> Stashed changes param_val[parameter] = value; } } -- 2.44.2