Dan Stillman 4b7cdddb4a Change apply-to-all checkbox text for some conflicts ... Say "Use the [local|remote] version for all remaining conflicts" for everything instead of saying "Use [local|remote] fields for all remaining conflicts" for some conflicts. This also fixes a test failure after 54343c49fb.		2019-09-21 01:35:36 -04:00
..
scaffold	Add Scaffold as a built-in developer tool	2019-08-02 07:00:39 -04:00
zotero	Change apply-to-all checkbox text for some conflicts	2019-09-21 01:35:36 -04:00