Fixed compilation issues.

[stg.git] / stglibs / conffiles.lib / conffiles.cpp

diff --git a/stglibs/conffiles.lib/conffiles.cpp b/stglibs/conffiles.lib/conffiles.cpp
index 4fb72f618ddc6e5f60abab6dff8d754280008446..302c365194ddd0cd6d08de0f4521a786c762c5ed 100644 (file)
--- 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));
 }
 {
 return TrimR(TrimL(val));
 }

-}

 //---------------------------------------------------------------------------
 } // namespace anonymous
 
 //---------------------------------------------------------------------------
 } // namespace anonymous
 


@@ -115,13 +114,8 @@ while (getline(f, line))
         return;
         }
 
         return;
         }
 

-<<<<<<< Updated upstream

     std::string parameter = Trim(line.substr(0, pos));
     std::string value = Trim(line.substr(pos + 1));
     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;
     }
 }
     param_val[parameter] = value;
     }
 }