cvs commit: src/contrib/netcat nc.1 netcat.c

[Xin LI]

delphij     2007-03-28 01:57:03 UTC

  FreeBSD src repository

  Modified files:
    contrib/netcat       nc.1 netcat.c 
  Log:
  Resolve conflicts.
  
  Revision  Changes    Path
  1.7       +3 -3      src/contrib/netcat/nc.1
  1.5       +24 -27    src/contrib/netcat/netcat.c