Disney and DirecTV have ended a carriage dispute that had left viewers without access to ESPN and ABC. Here's what the new deal means.

Disney and DirecTV’s spat began on September 1st, when negotiations between the two for a new carriage deal broke down, and Disney pulled all of its programming. Disney had a similar, 12-day dispute with Charter this time last year, blocking its channels for Spectrum subscribers in the middle of the US Open.

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.