Actor Kangana Ranaut and veteran lyricist Javed Akhtar have resolved their four-year-long defamation case through mediation.