The dispute between Perkins Coie and the American Alliance for Equal Rights over the law firm's two diversity fellowships has ended, according to a Wednesday stipulation of dismissal signed by lawyers for both parties in the Northern District of Texas.