diff options
author | root <root@miefda901.localdomain> | 2011-05-25 22:31:16 +0200 |
---|---|---|
committer | root <root@miefda901.localdomain> | 2011-05-25 22:31:16 +0200 |
commit | eabfe4c7b78e18d5aaa9e74bc148f00df25774ae (patch) | |
tree | 5faa370c23575036604ec4f2b17e4a42953e93a4 /retiolum/hosts/Lassulus | |
parent | dba9117eaecc50177cd93195fd5a1b480105aa34 (diff) | |
parent | 59a5152b93fbe7f3b438a6310805a83d7d412bea (diff) |
Merge branch 'master' of github.com:miefda/retiolum
Conflicts:
Lassulus
Diffstat (limited to 'retiolum/hosts/Lassulus')
-rw-r--r-- | retiolum/hosts/Lassulus | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/retiolum/hosts/Lassulus b/retiolum/hosts/Lassulus index 557a535a..48a702bd 100644 --- a/retiolum/hosts/Lassulus +++ b/retiolum/hosts/Lassulus @@ -1,5 +1,4 @@ Address = 10.42.3.253 -Address = 10.9.9.71 Subnet = 10.7.7.11 -----BEGIN RSA PUBLIC KEY----- MIIBCgKCAQEAsj1PCibKOfF68gmFQ+wwyfhUWpqKqpznrJX1dZ+daae7l7nBHvsE |