added Madrid and fixed conflict

This commit is contained in:
DarrenN 2015-02-16 08:00:18 -05:00
commit efb5de42d4

View File

@ -32,6 +32,7 @@ Here are our official chapters. Let us know if you are interested in [starting o
* [Vienna](http://www.meetup.com/Papers-We-Love-Vienna/)
* [Munich](http://www.meetup.com/Papers-We-Love-Munich/)
* [Hyderabad](http://www.meetup.com/papers-we-love-hyderabad/)
* [Madrid](http://www.meetup.com/Papers-We-Love-Madrid/)
All of our meetups follow our [Code of Conduct](CODE_OF_CONDUCT.md).