Fixing errors caused by merge.

examples/mean-curvature-flow/tnl-mean-curvature-flow-eoc.h

src/functors/initial_conditions/CMakeLists.txt

src/functors/initial_conditions/CMakeLists.txt~

...ors/initial_conditions/level_set_functions/CMakeLists.txt

...rs/initial_conditions/level_set_functions/CMakeLists.txt~

.../initial_conditions/level_set_functions/tnlBlobFunction.h

...initial_conditions/level_set_functions/tnlBlobFunction.h~

...ial_conditions/level_set_functions/tnlBlobFunction_impl.h

...al_conditions/level_set_functions/tnlBlobFunction_impl.h~

..._conditions/level_set_functions/tnlPseudoSquareFunction.h

...conditions/level_set_functions/tnlPseudoSquareFunction.h~

...itions/level_set_functions/tnlPseudoSquareFunction_impl.h

...tions/level_set_functions/tnlPseudoSquareFunction_impl.h~

src/functors/initial_conditions/tnlCylinderFunction.h

src/functors/initial_conditions/tnlCylinderFunction.h~

src/functors/initial_conditions/tnlCylinderFunction_impl.h

src/functors/initial_conditions/tnlCylinderFunction_impl.h~

src/functors/initial_conditions/tnlFlowerpotFunction.h

src/functors/initial_conditions/tnlFlowerpotFunction.h~

src/functors/initial_conditions/tnlFlowerpotFunction_impl.h