From 936367a1365d2ddc585dda79b7ced8d086313b45 Mon Sep 17 00:00:00 2001 From: Mike Buland Date: Tue, 22 Aug 2006 05:51:11 +0000 Subject: Fixed creepy conflict, two extra spaces in one version...sheesh --- src/configmanagerbase.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/configmanagerbase.cpp b/src/configmanagerbase.cpp index cf7eb3e..ac55fe0 100644 --- a/src/configmanagerbase.cpp +++ b/src/configmanagerbase.cpp @@ -23,7 +23,7 @@ void ConfigManagerBase::loadConfig( const std::string &sFileName, const char *lp std::list::const_iterator i; for( i = lSearchPath.begin(); i != lSearchPath.end(); i++ ) { - if( parseConfig( (*i+sFileName).c_str(), lpProfile ) ) + if( parseConfig( (*i + sFileName).c_str(), lpProfile ) ) { break; } -- cgit v1.2.3