Manual merge of git.dn42.us:Wenjie_Zhou/registry (pull request #1441) to fix merge conflicts

This commit is contained in:
Simon Marsh 2020-04-17 12:11:46 +01:00
commit 81b6fdf2c9
No known key found for this signature in database
GPG key ID: 30B29A716A54DBB3
7 changed files with 0 additions and 50 deletions

View file

@ -1,7 +0,0 @@
mntner: WJZ-MNT
admin-c: WJZ-DN42
tech-c: WJZ-DN42
mnt-by: WJZ-MNT
source: DN42
auth: pgp-fingerprint 7C5428A37E9FF82250A6797A09A07F7F557CEE7A
auth: ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAx6Mp0QwkTUKIgb+Oo5U0QCGoIvhyBl1kfbuOGOksAd1qUmyCLcf8u2La31D0bdiUEffhf7m7fiK3lWhJH5cvml8bgrinoddNMNat76Jor3azTUIxdhR3LisEYjBRKkYrTbt+qmYW9yfdzfyej1JAGJVogeEXbXBF9oKWvvfUQ9KElcgvS8hO23j4AHAEc7blu1RnXj9t96lyfLLXpgX838pjtpg1bnNk4ZuSikTFcX7FCEdtVOmwk+ftJO0zIBCOVl6AWhJ/Dt+PdsOKf35QReMil9IgqICoB+mIRv45PrS3BCWImLJbzPiebLbjLBTXXbsSti2wrPed+CUVzHeOTQ==