A feud between pop star Madonna and Warner Music Group has been settled after the recording giant agreed to buy her stake in the record label she co-founded.