Just hours after averting (for now) a blackout of CBS-owned stations in 14 markets, Dish Network has made nice with another of its foes in the broadcasting world, ending the month-long blackout of Turner channels like CNN, HLN, and the Cartoon Network.

It’s a temporary peace at best, as the end of the blackout doesn’t mean that the two parties have reached a deal. Instead, Dish and Turner have agreed to temporarily extend their previous agreement while they continue to hash out new terms.

This means that CNN, Cartoon Network, Adult Swim, truTV, TCM, HLN, CNN en Espanol and Boomerang are coming back to Dish subscribers’ screens, and that rumored potential blackouts of Turner-owned TBS and TNT are off the table.

During the blackout, Dish Chairman Charlie Ergen didn’t help ease tensions between the two sides when he publicly questioned the importance of CNN to a pay-TV company’s lineup.

“Twenty years ago, CNN was a must-have channel, but it’s not a top 10 network anymore,” said Ergen at the time.