Photo: SJSharkTank on Flickr
The settlement between the two television content providers means that Bay Area Dish Network fans will be able to watch their favorite local sports teams again.
The satellite provider had dropped the CSN California channel because of an argument over money between Dish Network and Comcast.
But the San Francisco Business Times reports that the two have reached an undisclosed financial agreement that will enable fans to watch the Sacramento Kings, the Oakland A's and the San Jose Sharks.
The fight got so feisty that Comcast was running a promotion encouraging Dish Network subscribers to switch to any other provider and receive a $150 gift card.