Carlsberg has settled its long-term disagreement with its former Thai partner Chang Beverages.