[PATCH] Adjust button order of the new resolve conflict dialog to the JOSM standard

[Michi]

As long as I know all dialogs have the confirmation / cancel buttons centered and the cancel button is always on the right of all buttons (see search, presets, relations, download, upload, status report, etc.). But the new resolve conflict dialog breaks with that standard: The buttons are aligned to the right and the cancel button is on the left. This is confusing for "fast mouse users" who have get used to it that the cancel button is always the rightmost button.

My attached patch changes the button order and centers the two buttons.

[Michi]

Patch for standardized button order

[stoecker]

In r1782.

Please make patches in the same directory as "ant" is called. This makes patching much easier (i.e. don't go down into source tree).