A prolonged industrial dispute over working conditions at Nestlé Waters' mineral water bottling plants in eastern France has been resolved, a senior company official has told just-drinks.