E&S CVS Commit: PEAK - oops, remove conflict markers

[tsarna at eby-sarna.com]

Module Name:	PEAK
Committed By:	tsarna
Date:		Sat Nov 22 15:39:42 UTC 2003

Modified Files:
	PEAK/src/peak/net: icb.py

Log Message:
oops, remove conflict markers


To view diffs of this commit, you can use the following URL(s):
http://cvs.eby-sarna.com/PEAK/src/peak/net/icb.py.diff?r1=1.5&r2=1.6

To generate a diff of this commit:
cvs rdiff -r1.5 -r1.6 PEAK/src/peak/net/icb.py

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.