fix(conflict): use latest gen/ from origin/master

that fixes a conflict when merging
This commit is contained in:
Sebastian Thiel
2017-05-22 20:48:47 +02:00
parent 9ffa241f37
commit c6d67daa81
594 changed files with 96349 additions and 45763 deletions

View File

@@ -1,4 +1,4 @@
site_name: appengine v1.0.4+20161208
site_name: appengine v1.0.4+20170522
site_url: http://byron.github.io/google-apis-rs/google-appengine1-cli
site_description: A complete library to interact with appengine (protocol v1)