Did Poseidon really fight with Athena over her kingdoms? Who won at the end?

They 'fought' over who would be the patron of Athens. Poseidon made a salt-water well whilst Athena made an olive-tree. The king chose Athena to be the patron of Athens and Poseidon cursed the city never to have enough water. That and Athena catching Poseidon and Medusa doing 'it' in her temple are the two main conflicts between them I think... Not really over kingdoms though, unless you count Athens...