Roan Kattouw 6fce4c6359 Make the Resolve conflict button actually appear ... If you got an edit conflict, the save dialog would dead-end: there was no way for you to actually get to the edit conflict resolution page because we were hiding the resolve button. Bug: 69150 Change-Id: Iaccb7d0ec25d8f15398e437d614184433c33e6eb		2014-08-27 01:06:54 +00:00
..
ce	Switch 'disallowQuotedKeysInObjects' jscs rule on and fix up	2014-08-22 13:50:48 -07:00
dm	Switch 'disallowQuotedKeysInObjects' jscs rule on and fix up	2014-08-22 13:50:48 -07:00
i18n	Localisation updates from https://translatewiki.net.	2014-08-23 22:02:15 +02:00
init	Merge "Switch 'disallowQuotedKeysInObjects' jscs rule on and fix up"	2014-08-25 18:00:07 +00:00
tests	Merge "Switch 'disallowQuotedKeysInObjects' jscs rule on and fix up"	2014-08-25 18:00:07 +00:00
ui	Make the Resolve conflict button actually appear	2014-08-27 01:06:54 +00:00