X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/1347f3d1e04bedd1508589173f577673ee2c5554..95fbaf3fe639c84d7aab1d8c25cecdb9f8e7072a:/stglibs/conffiles.lib/conffiles.cpp

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;
     }
 }