mirror of
https://github.com/zotero/zotero.git
synced 2026-09-20 00:12:49 +00:00
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
|
||
|---|---|---|
| .. | ||
| components | ||
| content | ||
| resource | ||
| tests | ||
| chrome.manifest | ||
| install.rdf | ||
| runtests.sh | ||