CBS Corporation and Dish Network reached a retransmission agreement twelve hours after the broadcast network yanked its channels from the satellite television platform.

The dispute — one of the shortest in recent times — affected dozens of CBS-owned stations and a handful of CW and MyNetwork stations across the country.

Under the deal, Dish Network’s 14 million subscribers will continue to have access to CBS-owned stations in 18 metropolitan television markets along with several cable channels, including CBS Sports Network and Showtime, for the next several years.

In addition, Dish has secured digital retransmission rights to allow subscribers to stream Showtime’s online offering to mobile phones, the Associated Press reported.

Exact financial terms of the agreement were not made available.

The agreement will impact Dish Network in a larger sense: Pending litigation filed by CBS Network over the company’s “Hopper” recording service will be dismissed, and Dish has agreed to enforce a seven-day freeze on its DVR’s fast-forwarding feature when subscribers try to view programs recorded from CBS-owned stations (it’s unclear if the same ban extends to non-CBS stations owned by the network and other CBS affiliates).

“We are pleased to continue delivering CBS programming to our customers while expanding their digital access to Showtime content through Showtime Anytime,” Dish executive Warren Schlichting said in a statement.

The blackout ended just in time for Dish customers to watch CBS coverage of several college football games.