Jermaine Dupri and Sony Music Entertainment have resolved their royalty dispute, ending a federal lawsuit less than two ...