Skip to content

Commit

Permalink
Merge branch 'master' of github.com:shagunsodhani/PyCon2016
Browse files Browse the repository at this point in the history
  • Loading branch information
shagunsodhani committed Sep 14, 2016
2 parents 05b8bc2 + 0a19573 commit 4216865
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions README.md
@@ -1,8 +1,9 @@
# PyCon2016

[![Join the chat at https://gitter.im/shagunsodhani/PyCon2016](https://badges.gitter.im/shagunsodhani/PyCon2016.svg)](https://gitter.im/shagunsodhani/PyCon2016?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
Code and Presentation for PyCon2016

[![Join the chat at https://gitter.im/shagunsodhani/PyCon2016](https://badges.gitter.im/shagunsodhani/PyCon2016.svg)](https://gitter.im/shagunsodhani/PyCon2016?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)

## Topic

[Big Data Analysis using PySpark](https://in.pycon.org/cfp/2016/proposals/big-data-analysis-using-pyspark~b8Mld/)
Expand Down Expand Up @@ -40,4 +41,4 @@ Code and Presentation for PyCon2016

## Attribution

The [image](https://d37djvu3ytnwxt.cloudfront.net/assets/courseware/v1/b24280c52ad86033de804a6e1ce17fd6/asset-v1:BerkeleyX+CS105x+1T2016+type@asset+block/Import1.png) showing the workflow to import the notebooks is created by [Databricks](https://databricks.com). Licence at [https://creativecommons.org/licenses/by-nc-nd/4.0/](https://creativecommons.org/licenses/by-nc-nd/4.0/)
The [image](https://d37djvu3ytnwxt.cloudfront.net/assets/courseware/v1/b24280c52ad86033de804a6e1ce17fd6/asset-v1:BerkeleyX+CS105x+1T2016+type@asset+block/Import1.png) showing the workflow to import the notebooks is created by [Databricks](https://databricks.com). Licence at [https://creativecommons.org/licenses/by-nc-nd/4.0/](https://creativecommons.org/licenses/by-nc-nd/4.0/)

0 comments on commit 4216865

Please sign in to comment.