harmonize conflict in sbp.html
authoradam <adam@megacz.com>
Mon, 26 Feb 2007 01:46:36 +0000 (20:46 -0500)
committeradam <adam@megacz.com>
Mon, 26 Feb 2007 01:46:36 +0000 (20:46 -0500)
commit153e6ad4bd7d87a16c115c38681d2a55f87fda42
tree70ef530dc73b493c507d8d86c996053e8241e746
parent15cadfcd5bdc493d4e3ab3aa864d5e34044c6ec2
harmonize conflict in sbp.html

darcs-hash:20070226014636-5007d-9e25a346af362aa3f87e6fcd06e4df529c70ce28.gz
doc/sbp.html