summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Richter <Felix.Richter@syntax-fehler.de>2011-05-27 21:57:36 +0200
committerFelix Richter <Felix.Richter@syntax-fehler.de>2011-05-27 21:57:36 +0200
commitf2b674acbc17673147f4977707cf9edb10ae129b (patch)
tree6cfd1c87ae4df8ad4a05fad55a31cf797c2bafbb
parent0569b3a2d4ababec4acda470aa56c8f232f5ff73 (diff)
parentd8c791f2d26cbdaf557836f53985da453dfa1be5 (diff)
Merge branch 'master' of github.com:krebscode/hosts
-rw-r--r--hosts/also1
-rw-r--r--hosts/miefda9011
2 files changed, 0 insertions, 2 deletions
diff --git a/hosts/also b/hosts/also
index 746455da..14001d7a 100644
--- a/hosts/also
+++ b/hosts/also
@@ -1,4 +1,3 @@
-Subnet = 10.7.7.23
Subnet = 42:9c90:a590:e88a:52cf:126f:b710:1a9c/128
-----BEGIN RSA PUBLIC KEY-----
MIIBCgKCAQEAsnF1eyd/R4qXMGo8UEZ98hnJK+6ZEKUubgdzEwAuSxK40B6nX8Ry
diff --git a/hosts/miefda901 b/hosts/miefda901
index b9a9156a..209a5e44 100644
--- a/hosts/miefda901
+++ b/hosts/miefda901
@@ -1,4 +1,3 @@
-Subnet = 10.7.7.22
Subnet = 42:23:5:22:0:0:0:0/64
-----BEGIN RSA PUBLIC KEY-----
MIIBCgKCAQEApbEYmHf0vEDYa/2aVvWVxEGgC+JJlXcArdxkQooSIpnZfSAfsH0S