Ed has apologized, publius has accepted. Everyone is moving on.
And I'm glad. Normally these things just turn into lingering bitterness, because normally people can't admit when they're wrong. It was big of Ed to apologize, and I admit that I wasn't expecting him to. This makes me think much more highly of him than I had before.
Obviously, I hope there are no long term repercussions for publius. Assuming that to be so, it's nice when things work out.