dn42/registry
1
0
Fork 0
mirror of https://git.dn42.dev/dn42/registry.git synced 2025-05-11 07:05:23 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Resolve merge conflict

Browse source
This commit is contained in:
Christopher Barnes 2019-12-17 14:47:28 +11:00
commit 23d9e86a74
No known key found for this signature in database
GPG key ID: ADF07443C7CFDA87
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
data/person/CPBARNES-DN42
View file

@ -3,4 +3,8 @@ nic-hdl: CPBARNES-DN42
mnt-by: CPBARNES-MNT mnt-by: CPBARNES-MNT
e-mail: chris.p.barnes@gmail.com e-mail: chris.p.barnes@gmail.com
source: DN42 source: DN42
<<<<<<< HEAD
pgp-fingerprint: 5EE7FE3C69F44CD34AFD0C64ADF07443C7CFDA87 pgp-fingerprint: 5EE7FE3C69F44CD34AFD0C64ADF07443C7CFDA87
=======
pgp-fingerprint 5EE7FE3C69F44CD34AFD0C64ADF07443C7CFDA87
>>>>>>> fe29433a1a277ffb27c7e42c07f94ed1dab5cc8e