Merge pull request #11 from zakx/master

removed advice to use GSM for emergency numbers
This commit is contained in:
Pepi Zawodsky 2013-12-23 19:12:07 -08:00
commit f883c4fbc4

View file

@ -67,8 +67,8 @@ If you're in an emergency shout HELP!
If you need help, just call for help, there are many, many people around to help you.
- 30C3 Medical Emergency or in case of fire: Call local DECT/GSM 112 (CERT)
- 30C3 Security: Call local DECT/GSM 110
- 30C3 Medical Emergency or in case of fire: Call local DECT 112 (CERT)
- 30C3 Security: Call local DECT 110
- 30C3 organizers: 30c3-orga@cccv.de
- Local law enforcement in Hamburg: 110 or +49 40 4286 - 51410
- Local sexual assault hotline in Hamburg: +49 40 - 255566 (http://www.frauennotruf-hamburg.de)
@ -377,4 +377,4 @@ These people have contributed to improve this list for everyone. In no particula
[117]:https://twitter.com/nic_ko
[118]:https://twitter.com/a_z_e_t
[119]:https://twitter.com/stefan2904
[120]:https://twitter.com/ccc
[120]:https://twitter.com/ccc