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

@@ -24,7 +24,7 @@ serde_json = "^ 0.9"
serde_derive = "^ 0.9"
yup-oauth2 = "^ 1.0"
strsim = "^0.5"
hyper-rustls = "^0.3"
hyper-rustls = "^0.6"
yup-hyper-mock = "^2.0"
clap = "^2.0"