Edinburgh have ended their rift with the Scottish Rugby Union and pledged to allow 12 players to attend training with the national squad.
A disciplinary panel ruled the club broke rules by stopping players joining World Cup training earlier this month.
But the penalty announced by the SRU was a straightforward censure, rather than any tangible punishment.
Edinburgh withdrew their notice of resignation made last week, and the SRU accepted the request.
The recent row has centred around Edinburgh's claim the SRU have failed to pay them Magners League and Heineken Cup fees, a contention which is denied.
Earlier on Thursday, Edinburgh owner Bob Carruthers expressed his frustration at the lack of dialogue in the dispute.
"It would be really good if I could stop having to address anonymous tittle-tattle and be able to talk directly to someone," he said.
Last Friday, Carruthers cancelled Edinburgh's associate membership of the SRU after the governing body reported the club to the International Rugby Board for pulling players out of a national training session.
But the SRU later backtracked on their claim the resignation meant they would not be able to fulfil their fixtures next season.
Carruthers also confirmed that the signing of 32-year-old Australia and Brumbies fly-half Stephen Larkham will go ahead.
"He is contracted to Edinburgh and he is an Edinburgh player," said Carruthers. "I've never spoken to him, other than through a television link.
"It's not my job, the guys in the backroom deal with players and all the rest of it. But he is an Edinburgh player."