The long-running dispute over Champion Lager has been settled.