Fix windows cmd trolling me

Author: roigcarlo

CMakeLists.txt

@@ -39,8 +39,8 @@ if(POLICY CMP0135)
 endif(POLICY CMP0135)
 
 # Set here the version number **** only update upon tagging a release!
-set (KratosMultiphysics_MAJOR_VERSION 9)
-set (KratosMultiphysics_MINOR_VERSION 6)
+set (KratosMultiphysics_MAJOR_VERSION 10)
+set (KratosMultiphysics_MINOR_VERSION 0)
 set (KratosMultiphysics_PATCH_VERSION 0)
 
 # If KRATOS_SOURCE_DIR is not defined use the CMAKE_SOURCE_DIR

applications/HDF5Application/custom_io/hdf5_file.h

@@ -460,11 +460,7 @@ namespace Internals
  * Valid paths are similar to linux file system with alphanumeric names
  * and possible underscores separated by '/'. All paths are absolute.
  */
-<<<<<<< HEAD
 KRATOS_API(HDF5_APPLICATION) bool IsPath(const std::string& rPath);
-=======
-bool KRATOS_API(HDF5_APPLICATION) IsPath(const std::string& rPath);
->>>>>>> master
 
 /// Return vector of non-empty substrings separated by a delimiter.
 std::vector<std::string> Split(const std::string& rPath, char Delimiter);