-
Sean McGivern authored
When a conflict is resolved, we don't want to change the spinner back to the normal button before the new page load happens, so only do this on failure.
cbcf00e1
When a conflict is resolved, we don't want to change the spinner back to the normal button before the new page load happens, so only do this on failure.