diff options
| author | Mike Buland <eichlan@xagasoft.com> | 2006-08-22 05:51:11 +0000 |
|---|---|---|
| committer | Mike Buland <eichlan@xagasoft.com> | 2006-08-22 05:51:11 +0000 |
| commit | 936367a1365d2ddc585dda79b7ced8d086313b45 (patch) | |
| tree | 2294811b0e64b338ffb1679362393f65c7e33f01 /src | |
| parent | 3603e0707f066228267709fd40d76d8573329869 (diff) | |
| download | libbu++-936367a1365d2ddc585dda79b7ced8d086313b45.tar.gz libbu++-936367a1365d2ddc585dda79b7ced8d086313b45.tar.bz2 libbu++-936367a1365d2ddc585dda79b7ced8d086313b45.tar.xz libbu++-936367a1365d2ddc585dda79b7ced8d086313b45.zip | |
Fixed creepy conflict, two extra spaces in one version...sheesh
Diffstat (limited to '')
| -rw-r--r-- | src/configmanagerbase.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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 | |||
| 23 | std::list<std::string>::const_iterator i; | 23 | std::list<std::string>::const_iterator i; |
| 24 | for( i = lSearchPath.begin(); i != lSearchPath.end(); i++ ) | 24 | for( i = lSearchPath.begin(); i != lSearchPath.end(); i++ ) |
| 25 | { | 25 | { |
| 26 | if( parseConfig( (*i+sFileName).c_str(), lpProfile ) ) | 26 | if( parseConfig( (*i + sFileName).c_str(), lpProfile ) ) |
| 27 | { | 27 | { |
| 28 | break; | 28 | break; |
| 29 | } | 29 | } |