Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
dzuro02 authored and dzuro02 committed Feb 9, 2017
2 parents 1f38405 + 4c266c6 commit a2cdaed
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/miscPython.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion uncategorized.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
print("pygame version: %s" % pygame.__version__)

############################################################################################
import requests_cache
#import requests_cache
import requests

import dataset
Expand Down

0 comments on commit a2cdaed

Please sign in to comment.