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 | eec959b12d6bb60c27e12958643c4f3020fd0a2e (patch) | |
tree | 8bf968e30f3d7fce05dde9b3bce65f372828f089 /hosts/Lassulus | |
parent | 8928f9f9303bc6b18c26476703058ca429864301 (diff) | |
parent | dd2ba750ce2f6fb8d7851c7978dd6b61f8dca9c6 (diff) |
Merge branch 'master' of github.com:miefda/retiolum
Conflicts:
Lassulus
Diffstat (limited to 'hosts/Lassulus')
-rw-r--r-- | hosts/Lassulus | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/hosts/Lassulus b/hosts/Lassulus index 557a535a..48a702bd 100644 --- a/hosts/Lassulus +++ b/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 |