CVSROOT: /cvsroot/hurd Module name: hurd Branch: zhengda-soc2008-virt-branch Changes by: Thomas Schwinge <tschwinge> 08/10/02 16:58:40
Modified files:
pfinet : ChangeLog
Log message:
Remove conflict markers.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/hurd/pfinet/ChangeLog?cvsroot=hurd&only_with_tag=zhengda-soc2008-virt-branch&r1=1.87.8.2&r2=1.87.8.3
