yade-dev team mailing list archive

[Jérôme Duriez <jerome.duriez@xxxxxxxxxxxxxxx>]

Sorry,

> - why "35 revisions removed" on 04/10 19h32 ? (whereas I still can 
> find on https://github.com/yade/trunk new files I added in one of 
> these 35 removed revisions ?) 
this last remark has just become less relevant : I just discovered in my 
spam the mail about the new Rev3697 that re-added the files I spoke 
about.. Remains then only the curiosity concerning the reason of these 
removal - readd ? (and the other next remark)

> - Especially concerning this mail I answer to, I see
>
> Le 04/10/2013 19:31, noreply@xxxxxxxxxxxxx a écrit :
> >      Conflicts:
> >        pkg/dem/VTKRecorder.cpp
> >        pkg/dem/VTKRecorder.hpp
> Is there really a problem ? I feared first that yes, but could not 
> find anything special in the code of these files ?