SCRUM#87 - Get distro info on windows

src/agent/get_distro.cpp

@@ -149,14 +149,8 @@ std::string get_distro() {
 
 #ifdef WIN32
 /** Get Windows version */
-<<<<<<< HEAD
-std::string get_winver() {
-    std::string version_name;
-    std::string line;
-=======
 std::string get_distro_win() {
     std::string version_name, line, cmd;
->>>>>>> 3a78785... SCRUM#87 - Get distro info on windows
     if (IsWindowsVistaOrGreater()) {
         try {
             cmd  = exec("systeminfo");
@@ -178,15 +172,16 @@ std::string get_distro_win() {
         }
     } else if (!IsWindowsXPSP1OrGreater()) {
         return version_name.assign("Windows XP");
-    if (!IsWindowsXPSP2OrGreater())
+    } else if (!IsWindowsXPSP2OrGreater()) {
         return version_name.assign("Windows XP SP1");
-    if (!IsWindowsXPSP3OrGreater())
+    } else if (!IsWindowsXPSP3OrGreater()) {
         return version_name.assign("Windows XP SP2");
-    if (!IsWindowsVistaOrGreater())
+    } else if (!IsWindowsVistaOrGreater()) {
         return version_name.assign("Windows XP SP3");
     } else {
         throw std::string("unknown distro");
     }
+
     throw std::string("unknown distro");
 }
 #endif  // WIN32