missytake/CongressChecklist
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fixed my merge foobar. Added better linking to Schuko plugs.

Browse source
This commit is contained in:
Pepi Zawodsky 2012-12-25 20:07:40 +01:00
parent 8f23f3c585
commit b9ee8d54c7
1 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
README.md
View file

@ -40,12 +40,8 @@ You'll also find list of all the nice humans who have contributed to this list a
- Passport or other kind of photo ID (Personalausweis) - Passport or other kind of photo ID (Personalausweis)
- Driver's license (even an international one) - Driver's license (even an international one)
- Hotel booking - Hotel booking
<<<<<<< HEAD
- Ham radio license (CEPT license) - Ham radio license (CEPT license)
======= - [Hackerspace passport][5]
- Ham radio license
- Hackerspace passport[5]
>>>>>>> 7bcb1e55feaa42a1288fd874bc7bb3ff033bbed3
@ -144,11 +140,11 @@ Your personal medication does not belong on the public interwebs for your privac
### Gear ### Gear
- Laptop (with a working battery) - Laptop (with a working battery)
- Charger for Laptop - Charger for Laptop
- Mac: Small Duck-head and long (Schuko Plug) cord - Mac: Small Duck-head and long ([Schuko Plug][6]) cord
- Mac: MagSafe to MagSafe 2 Adapter - Mac: MagSafe to MagSafe 2 Adapter
- Plug adaptor from your country of origin to Schuko[6] - Plug adaptor from your country of origin to [Schuko Plug][6]
- 3* or 5* Extension (230V≈ @50Hz) with Schuko Plug (and optional switch) - 3* or 5* Extension (230V≈ @50Hz) with [Schuko Plug][6] (and optional switch)
- Simple extension cord (230V @50Hz, Schuko Plug) - Simple extension cord (230V @50Hz, [Schuko Plug][6])
- USB Sticks - USB Sticks
- Put an OWNER.txt file on them with information on how to contact you in case one gets lost accidentally. (Twitter, phone (for example DECT, 29C3 GSM extensions), email, name of the assembly you're well known at, owl, raven) - Put an OWNER.txt file on them with information on how to contact you in case one gets lost accidentally. (Twitter, phone (for example DECT, 29C3 GSM extensions), email, name of the assembly you're well known at, owl, raven)
- For devices with private information be sure to encrypt them! (TrueCrypt, GPG, FileVault) - For devices with private information be sure to encrypt them! (TrueCrypt, GPG, FileVault)
@ -250,6 +246,7 @@ These people have contributed to improve this list for everyone. In no particula
- [N4mes][101] - [N4mes][101]
- [towo][102] - [towo][102]
- [michaelem][103] - [michaelem][103]
- [devdsp][104]
## Links ## Links
@ -264,3 +261,4 @@ These people have contributed to improve this list for everyone. In no particula
[101]:https://twitter.com/N4mes [101]:https://twitter.com/N4mes
[102]:https://twitter.com/towo [102]:https://twitter.com/towo
[103]:https://twitter.com/michaelem [103]:https://twitter.com/michaelem
[104]:https://github.com/devdsp