It would appear so but who knows what might happen next.
It's a good thing that this has been sorted, if it hadn't been we probably would have seen a situation with the Borders being revived at Edinburgh's expense followed by an exodus of the top players and be left with a far weaker team with the Borders which would only weaken the Magners League even further.
The worrying thing though which still hasn't gone away seems to be the incompetence of the Union, unless they seriously get their house in order we'll have more problems like this one further down the line.