Fix keyfile from/to parameter collision#3961

Merged

droidmonkey merged 1 commit intokeepassxreboot:release/2.5.2from wizzk42:fix/cli-merge-key-from-param

Dec 21, 2019

+107-6

Commits on Dec 21, 2019

CLI: Fix keyfile from/to parameter collision in merge command

wizzk42
authored and
droidmonkey
committed