Canadian lingerie retailer La Senza and Dutch retail chain Hunkemoller have settled their dispute over trademark issues.