Fix some merge conflicts

This commit is contained in:
Mike Reeves
2021-03-08 11:43:24 -05:00
6 changed files with 30 additions and 10 deletions

View File

@@ -1 +1 @@
net.ipv4.ip_local_reserved_ports="55000,57314"
net.ipv4.ip_local_reserved_ports=55000,57314