Merge pull request 'solve conflict' (#2496) from mark22k/registry:solve_conflict into master

Reviewed-on: https://git.dn42.dev/dn42/registry/pulls/2496
This commit is contained in:
Simon Marsh 2023-01-29 18:49:06 +00:00
commit 19a6513d6a

View file

@ -7,5 +7,5 @@ nserver: b0l3yah-prototype.ty3r0x.dn42
admin-c: TY3R0X-DN42
tech-c: TY3R0X-DN42
mnt-by: TY3R0X-MNT
status: ASSIGNED
status: ALLOCATED
source: DN42