Fix conflicts

This commit is contained in:
BDR 2021-03-29 21:29:06 +02:00
commit 0a48aaab08

View file

@ -1,6 +1,6 @@
http, 200, Google Website, https://google.com http, 200, Google Website, https://google.com
http4, 200, Google Website (IPv4), https://google.com
http6, 200, Google Website (IPv6), https://google.com
http, 404, Google 404, https://google.com/dummy http, 404, Google 404, https://google.com/dummy
http4, 200, Google website (IPv4), https://google.com
http6, 200, Google website (IPv6), https://google.com
ping, 0, Google ping, 8.8.8.8 ping, 0, Google ping, 8.8.8.8
port, 0, Google DNS, 8.8.8.8 53 port, 0, Google DNS, 8.8.8.8 53

1 http 200 Google Website https://google.com
2 http4 200 Google Website (IPv4) https://google.com
3 http6 200 Google Website (IPv6) https://google.com
4 http 404 Google 404 https://google.com/dummy
http4 200 Google website (IPv4) https://google.com
http6 200 Google website (IPv6) https://google.com
5 ping 0 Google ping 8.8.8.8
6 port 0 Google DNS 8.8.8.8 53