The dispute between publisher Hachette and Amazon seems to have concluded. Both companies have announced that a deal has been struck, with Hachette being able to set prices on e-books that it sells. Other specific terms of the deal have not yet been made public, and will not likely ever face public scrutiny outside the publishing industry.