Fixing merge errors.

src/functors/initial_conditions/CMakeLists.txt

@@ -8,4 +8,4 @@ SET( headers tnlCylinderFunction.h
              tnlTwinsFunction_impl.h             
    )
    
-INSTALL( FILES ${headers} DESTINATION include/tnl-${tnlVersion}/functions/initial_conditions )
+INSTALL( FILES ${headers} DESTINATION include/tnl-${tnlVersion}/functors/initial_conditions )

src/functors/initial_conditions/level_set_functions/CMakeLists.txt

@@ -4,4 +4,4 @@ SET( headers tnlBlobFunction.h
              tnlPseudoSquareFunction_impl.h          
    )
    
-INSTALL( FILES ${headers} DESTINATION include/tnl-${tnlVersion}/functions/initial_conditions/level_set_functions )
+INSTALL( FILES ${headers} DESTINATION include/tnl-${tnlVersion}/functors/initial_conditions/level_set_functions )

src/problems/tnlHeatEquationProblem.h

@@ -77,8 +77,8 @@ class tnlHeatEquationProblem : public tnlPDEProblem< Mesh,
                            const RealType& tau,
                            const MeshType& mesh,
                            DofVectorType& _u,
-                           MeshDependentDataType& meshDependentData,
-                           DofVectorType& _fu );
+                           DofVectorType& _fu,
+			   MeshDependentDataType& meshDependentData );
 
       template< typename Matrix >
       void assemblyLinearSystem( const RealType& time,

src/problems/tnlHeatEquationProblem_impl.h

@@ -181,8 +181,8 @@ getExplicitRHS( const RealType& time,
                 const RealType& tau,
                 const MeshType& mesh,
                 DofVectorType& u,
-                MeshDependentDataType& meshDependentData,
-                DofVectorType& fu )
+                DofVectorType& fu,
+		MeshDependentDataType& meshDependentData )
 {
    /****
     * If you use an explicit solver like tnlEulerSolver or tnlMersonSolver, you