diff options
| author | Chinaman <root@chinaman> | 2011-07-14 06:11:17 +0200 |
|---|---|---|
| committer | Chinaman <root@chinaman> | 2011-07-14 06:11:17 +0200 |
| commit | e6f6b28d1d121d477a0aa033c788234ccad92cb2 (patch) | |
| tree | 490a13515c199540d3f347eaafa5cf618d1b8c96 /hosts/miefdahome | |
| parent | b306f47b59f5b94ccacb001c1b617c625664dbbe (diff) | |
| parent | b96e107487fa22d56d4413012cc70845fb739074 (diff) | |
Merge branch 'master' of https://github.com/krebscode/hosts
Conflicts:
bergwerk
Diffstat (limited to 'hosts/miefdahome')
| -rw-r--r-- | hosts/miefdahome | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/hosts/miefdahome b/hosts/miefdahome index 9a9f4310..dd7a89af 100644 --- a/hosts/miefdahome +++ b/hosts/miefdahome @@ -1,9 +1,10 @@ Subnet = 10.7.7.30 + -----BEGIN RSA PUBLIC KEY----- -MIIBCgKCAQEAopwKn000XAcoI61OqQ7cjgrPHm/jHmuB1LHeCUggWMOD78WDFNzq -8/l9ASlU9kbSZFhoMuBR5BPWgciYWsC1EqY1nRAc/Si1rUHnJw+Xcyl0MNsZ7Cef -WaFRvC1VNC3qlQp5/e+fi46oOp4i+BqlFSxe7Jrr0EVyBVTOw8rMGToqDsOih6M9 -SFvmVMOnqh7n8LEOUtAL4nID59k7CTXzoNhXc0cEJoBkC2YCexonb4ru/J8F2BRG -Y3yzHYVskBrrPie1JNhfUHGCABIbtODTiHQYH8NFTYzdBnVV88IWqiTBbmKcRf+j -zEyGyXu/3YLFfjmsi7ysT+BWLIPvkyr7/wIDAQAB +MIIBCgKCAQEAtKNWDTK92VGAqfkoy+cWscq3Gp3UJv+NldFGny/PZHG7/0zT7Fri +VDG+XhVkY5lXz2FyRWPsxwZBEQJlnjswx5zpNsjwCS29a4fTw9lnc26KRSXfGW56 +V/ow2xaPF+n6e9aebOf660FfK10RcBsBAJ956UelahiuwTTXqEnnA0zA0tpJWAdU +KG+jYARZj2kGy+Trr1ud/PUUXoy+pxID0SW0Xj0l1soxkNEPf2kLwBpaQrwI7uxf +VI+chpR7ZXJOEBj2vevIVOtxX6X9TubEp3WQfiQzOHB1uW8okHI0wEY5zwrozga/ +xAFGktiwuux1pNdcCUyZmvhTKkHS6gyw4wIDAQAB -----END RSA PUBLIC KEY----- |