diff options
author | mattkae <mattkae@protonmail.com> | 2022-06-07 08:23:47 -0400 |
---|---|---|
committer | mattkae <mattkae@protonmail.com> | 2022-06-07 08:23:47 -0400 |
commit | bd18a38c2898548a3664a9ddab9f79c84f2caf4a (patch) | |
tree | 95b9933376770381bd8859782ae763be81c2d72b /elpa/gnupg | |
parent | b07628dddf418d4f47b858e6c35fd3520fbaeed2 (diff) | |
parent | ef160dea332af4b4fe5e2717b962936c67e5fe9e (diff) |
Merge conflict
Diffstat (limited to 'elpa/gnupg')
-rw-r--r-- | elpa/gnupg/pubring.kbx | bin | 2413 -> 0 bytes |
-rw-r--r-- | elpa/gnupg/trustdb.gpg | bin | 1200 -> 0 bytes |
2 files changed, 0 insertions, 0 deletions
diff --git a/elpa/gnupg/pubring.kbx b/elpa/gnupg/pubring.kbx Binary files differdeleted file mode 100644 index 39c049f..0000000 --- a/elpa/gnupg/pubring.kbx +++ /dev/null diff --git a/elpa/gnupg/trustdb.gpg b/elpa/gnupg/trustdb.gpg Binary files differdeleted file mode 100644 index c5e8ee9..0000000 --- a/elpa/gnupg/trustdb.gpg +++ /dev/null |