Fix vadia

This commit is contained in:
June 2023-05-01 21:32:41 +02:00
parent 4ee64ae10d
commit bf6d98b119
No known key found for this signature in database
GPG key ID: 0AEBD2FDF96DFDA1

View file

@ -1,10 +1,5 @@
<<<<<<< HEAD
@ 10800 IN SOA ns1.dns-witch.net.eu.org. june.lacoloc.cafe. (
2021022103 ; Numero
=======
@ 10800 IN SOA ns1.dns-witch.net.eu.org. dns-witch.familier.net.eu.org ( @ 10800 IN SOA ns1.dns-witch.net.eu.org. dns-witch.familier.net.eu.org (
2023050101 ; Numero 2023050101 ; Numero
>>>>>>> af8178e92cf30e5d97e6199da891f7771934cdc4
28800 ; Refresh 28800 ; Refresh
14400 ; Retry 14400 ; Retry
3600000 ; Expire 3600000 ; Expire
@ -13,13 +8,9 @@
@ IN 3600 NS ns1.dns-witch.net.eu.org. @ IN 3600 NS ns1.dns-witch.net.eu.org.
@ IN 3600 NS ns2.dns-witch.net.eu.org. @ IN 3600 NS ns2.dns-witch.net.eu.org.
<<<<<<< HEAD
; A Records ; A Records
@ IN 3600 A 82.123.22.107 @ IN 3600 A 82.123.22.107
; AAAA Records ; AAAA Records
; CNAME Records ; CNAME Records
=======
@ IN 3600 A 82.123.22.107
>>>>>>> af8178e92cf30e5d97e6199da891f7771934cdc4