diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-12-27 15:06:02 +0100 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-12-27 15:06:02 +0100 |
commit | 09410e7f697395b1764e5f8e56581fe1d93be1fa (patch) | |
tree | fa83b21a699be75f25b9bcd920b58fa101a65eb6 /OpenKeychain/src/main/res/layout | |
parent | aca0cd340bda38cc15547aa5a116c679782ff740 (diff) | |
download | open-keychain-09410e7f697395b1764e5f8e56581fe1d93be1fa.tar.gz open-keychain-09410e7f697395b1764e5f8e56581fe1d93be1fa.tar.bz2 open-keychain-09410e7f697395b1764e5f8e56581fe1d93be1fa.zip |
Fix merge conflicts
Diffstat (limited to 'OpenKeychain/src/main/res/layout')
0 files changed, 0 insertions, 0 deletions