Skip to content

Updated Caching #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 16 commits into from
Closed
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Removed merge artifacts
  • Loading branch information
elibixby committed May 14, 2015
commit 9db19b1063e92ee64c1cc9681bd3f2a0d72add7c
3 changes: 0 additions & 3 deletions datastore/ndb/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

This is a sample app for Google App Engine that exercises the [NDB Python API](https://cloud.google.com/appengine/docs/python/ndb/).

<<<<<<< HEAD
See our other [Google Cloud Platform github
repos](https://github.com/GoogleCloudPlatform) for sample applications and
scaffolding for other python frameworks and use cases.
Expand Down Expand Up @@ -57,5 +56,3 @@ scaffolding for other python frameworks and use cases.
## Licensing

* See [LICENSE](../../LICENSE)
=======
>>>>>>> f27081371547d83cb72eb84a0947eb17e95e62d9