solve conflict

Signed-off-by: Marek Küthe <m.k@mk16.de>

fix typo

Signed-off-by: Marek Küthe <m.k@mk16.de>
This commit is contained in:
Marek Küthe 2023-01-29 14:41:51 +01:00
parent 03a61ba299
commit f211a482e6
No known key found for this signature in database
GPG key ID: 7E869146699108C7

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