A legal battle between two bottled water companies that has bounced between various courts for more than two years has finally been settled.