The Italian, who is now in charge of Sunderland, accused the Robins of a breach of contract when he resigned in February, claiming that his position had become "untenable".
An employment tribunal was expected to take place on Friday, but the issue has now been resolved.
Di Canio joined Swindon in May 2011 before helping the club gain promotion to League One during his first season.