fix conflict

[modules/med.git] / medtool / src / ParaMEDMEM / MPIAccessDEC.cxx

diff --git a/medtool/src/ParaMEDMEM/MPIAccessDEC.cxx b/medtool/src/ParaMEDMEM/MPIAccessDEC.cxx
index f8a0e1002c8183278f8227aaaaf6b4a3bb0e77a2..18184dc27c636f88185ce580d4dc0b3973ecf1fe 100644 (file)
--- a/medtool/src/ParaMEDMEM/MPIAccessDEC.cxx
+++ b/medtool/src/ParaMEDMEM/MPIAccessDEC.cxx
@@ -568,7 +568,7 @@ namespace ParaMEDMEM
             int recvsize = recvcount*_MPI_access->extent( recvtype ) ;
             checkTime( recvcount , recvtype , target , false ) ;
             //===========================================================================
-            //TODO : it is assumed actually that we have only 1 timestep before nad after
+            //TODO : it is assumed actually that we have only 1 timestep before and after
             //===========================================================================
             if ( _time_interpolator && (*_time_messages)[target][0].time != -1 )
               {