harmonize conflict in sbp.html
[sbp.git] / tests / settings.xml
2006-03-30 adamcheckpoint