A short but tense distribution dispute between Disney and DirecTV came to an end Saturday after the two sides agreed to a new deal that will restore Disney-owned channels, including ABC, ESPN and FX,

The two companies on Saturday ended their dispute, which resulted in a blackout on the service of ESPN, ABC and other Disney-owned channels that began on Sept. 1.

After a two-week negotiation stalemate, DirecTV and Disney reached an agreement Saturday morning, ending a blackout of ESPN, ABC and Disney Channel.