Fix merge conflict for adding Chicago chapter

This commit is contained in:
Jeremy Heiler 2014-08-21 00:15:47 -04:00
commit 5d30a30605

View File

@ -6,6 +6,7 @@ Here are our official chapters. Let us know if you are interested in [starting o
* [New York City](http://www.meetup.com/papers-we-love/) * [New York City](http://www.meetup.com/papers-we-love/)
* [San Francisco](http://www.meetup.com/papers-we-love-too/) * [San Francisco](http://www.meetup.com/papers-we-love-too/)
* [Chicago](http://www.meetup.com/Papers-We-Love-Chicago)
* [London](http://www.meetup.com/papers-we-love-london) * [London](http://www.meetup.com/papers-we-love-london)
* [Saint Louis](http://www.meetup.com/Papers-We-Love-in-saint-louis/) * [Saint Louis](http://www.meetup.com/Papers-We-Love-in-saint-louis/)
* [Colorado](http://www.meetup.com/Papers-We-Love-Boulder/) * [Colorado](http://www.meetup.com/Papers-We-Love-Boulder/)
@ -15,7 +16,6 @@ Here are our official chapters. Let us know if you are interested in [starting o
* [Boston](http://www.meetup.com/Papers-We-Love-Boston/) * [Boston](http://www.meetup.com/Papers-We-Love-Boston/)
* [Singapore](https://www.facebook.com/groups/paperswelovesg/) * [Singapore](https://www.facebook.com/groups/paperswelovesg/)
All of our meetups follow our [Code of Conduct](CODE_OF_CONDUCT.md). All of our meetups follow our [Code of Conduct](CODE_OF_CONDUCT.md).
### Past Presentations ### Past Presentations