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

@@ -915,7 +915,7 @@ fn main() {
let mut app = App::new("cloudmonitoring2-beta2")
.author("Sebastian Thiel <byronimo@gmail.com>")
.version("1.0.4+20161031")
.version("1.0.4+20170501")
.about("Accesses Google Cloud Monitoring data.")
.after_help("All documentation details can be found at http://byron.github.io/google-apis-rs/google_cloudmonitoring2_beta2_cli")
.arg(Arg::with_name("url")