With only a few hours to go until a retransmission fee dispute would have left DirecTV subscribers unable to watch a number of Fox cable channels, the two sides have put away their swords and decided to work out a deal.

In a statement sent to Consumerist, the two parties write:

Fox Networks and DIRECTV have reached an agreement for DIRECTV to continue carrying all Fox Networks (including FX, National Geographic Channel, Nat Geo WILD, SPEED, FUEL TV, FOX Soccer, FOX Soccer Plus and FOX Deportes), Fox’s regional sports networks, Fox Broadcasting (FOX), the FOX local stations, Fox News Channel and Fox Business Network. We both know the past ten days have been challenging, but we’re pleased that both sides could eventually come together to ensure our viewers continue to enjoy Fox programming.

Only a few days ago, DirecTV wrote to the FCC, alleging that Fox was misleading consumers in ads that stated that “soon, in some markets, you may lose your local Fox station.”

But that all appears to be water under the bridge or some other tired metaphor.

Want more consumer news? Visit our parent organization, Consumer Reports, for the latest on scams, recalls, and other consumer issues.