mirror of
https://github.com/zotero/zotero.git
synced 2026-09-21 00:22:44 +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
|
||
|---|---|---|
| .. | ||
| content | ||
| locale | ||
| skin/default | ||