cvs commit: CVSROOT modules

[Ruslan Ermilov]

ru          2003/06/22 12:19:09 PDT

  FreeBSD src repository

  Modified files:
    .                    modules 
  Log:
  When there is a conflict between RELENG_4 and HEAD, prefer the HEAD path.
  
  Revision  Changes    Path
  1.6843    +5 -5      CVSROOT/modules