A strike in French Polynesia which left part of the main port's industrial zone blockaded has been lifted.
The action affected gas supplies in Tahiti but has now been settled.
Meanwhile, a planned strike at the international airport in Tahiti Faaa has been called off.
The strike notice was withdrawn just hours before its expiry at midnight.