Re: cvs commit: src/crypto/openssh-4 - Imported sources

["Simon 'corecode' Schubert" <corecode@xxxxxxxxxxxx>]

Simon Schubert wrote:
>   94 conflicts created by this import.
>   Use the following command to help the merge:

those conflicts appeared because the last import was done with cvs add. 
 I pulled all files on the OPENSSH vendor branch again to fix that.

cheers
  simon

--
Serve - BSD     +++  RENT this banner advert  +++    ASCII Ribbon   /"\
Work - Mac      +++  space for low €€€ NOW!1  +++      Campaign     \ /
Party Enjoy Relax   |   http://dragonflybsd.org      Against  HTML   \
Dude 2c 2 the max   !   http://golden-apple.biz       Mail + News   / \