From e44610ddb61ccb94037a563fbbfa4b4acc1c35ab Mon Sep 17 00:00:00 2001 From: ponyma Date: Tue, 22 Oct 2024 05:52:12 -0400 Subject: [PATCH] registy --- data/key-cert/PGPKEY-171CC2BA | 7 +++++++ data/person/PONYMA-DN42 | 4 ++++ 2 files changed, 11 insertions(+) diff --git a/data/key-cert/PGPKEY-171CC2BA b/data/key-cert/PGPKEY-171CC2BA index 2d3d63068..92c833e6e 100644 --- a/data/key-cert/PGPKEY-171CC2BA +++ b/data/key-cert/PGPKEY-171CC2BA @@ -1,9 +1,16 @@ key-cert: PGPKEY-171CC2BA method: PGP +<<<<<<< Updated upstream fingerpr: 27DD 6759 B4C1 5A51 D3F0 7DE2 E26D C5DA 171C C2BA owner: ponyma certif: -----BEGIN PGP PUBLIC KEY BLOCK----- certif: +======= +fingerpr: 27DD 6759 B4C1 5A51 D3F0 7DE2 E26D C5DA 171C C2BA +owner: ponyma +certif: -----BEGIN PGP PUBLIC KEY BLOCK----- +certif: +>>>>>>> Stashed changes certif: mQINBGcXUkABEACuwI4XsSmd6yQwS/VoIG4PFM9TpUhqmTQsM4LHdFErJPlngFRS certif: N/F/YagYxA/WEFkSxTQd+ZSAlZEXBv7x/1C7s3KsW7WCWYNKFwGAeXZu1dTfAq0i certif: hfm7S7dhjxS8bPUGdDVokhMDpvd7NJEZpJStOGwCI8BRQu1N2cc4iV/jAUw+p+Li diff --git a/data/person/PONYMA-DN42 b/data/person/PONYMA-DN42 index 0a2e633cf..9d211f679 100644 --- a/data/person/PONYMA-DN42 +++ b/data/person/PONYMA-DN42 @@ -1,5 +1,9 @@ person: ponyma +<<<<<<< Updated upstream e-mail: mxuhq3gvl@smoe.cloudns.org +======= +e-mail: mxuhq3gvl@smoe.cloudns.org +>>>>>>> Stashed changes nic-hdl: PONYMA-DN42 mnt-by: PONYMA-MNT source: DN42