diff options
| author | Felix Richter <Felix.Richter@syntax-fehler.de> | 2011-05-10 21:08:59 +0200 |
|---|---|---|
| committer | Felix Richter <Felix.Richter@syntax-fehler.de> | 2011-05-10 21:08:59 +0200 |
| commit | 135fcee283288985e825181ebcfcae359e4975c8 (patch) | |
| tree | 88dd18bec97727687d970a82c97a0eff4780512b /hosts/miefdahome | |
| parent | d14a56d2ac17233dcadac87ecab090b26f8d7150 (diff) | |
| parent | b54e30f1d4b37f9b01be4434d6b03e6301c46e14 (diff) | |
Merge remote-tracking branch 'oldrepo/master'
Conflicts:
krebs: newline deleted
miefdahome: local net deleted
supernode: replaced ip with dns entry
Diffstat (limited to 'hosts/miefdahome')
| -rw-r--r-- | hosts/miefdahome | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/hosts/miefdahome b/hosts/miefdahome index 180bbde7..9a9f4310 100644 --- a/hosts/miefdahome +++ b/hosts/miefdahome @@ -1,6 +1,4 @@ -Address = 192.168.10.119 Subnet = 10.7.7.30 - -----BEGIN RSA PUBLIC KEY----- MIIBCgKCAQEAopwKn000XAcoI61OqQ7cjgrPHm/jHmuB1LHeCUggWMOD78WDFNzq 8/l9ASlU9kbSZFhoMuBR5BPWgciYWsC1EqY1nRAc/Si1rUHnJw+Xcyl0MNsZ7Cef |