loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

update java petstore

Browse Source
This commit is contained in:
wing328
2017-05-14 22:53:25 +08:00
parent 7fc36f1e1e
commit 67c61eed0b
2 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
samples/client/petstore/java/okhttp-gson/.swagger-codegen/VERSION Normal file
View File

@@ -0,0 +1 @@
2.3.0-SNAPSHOT

3
samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/ApiClient.java
View File

@@ -196,8 +196,6 @@ public class ApiClient {
return this;
}
<<<<<<< HEAD
=======
public KeyManager[] getKeyManagers() {
return keyManagers;
}
@@ -219,7 +217,6 @@ public class ApiClient {
return dateFormat;
}
>>>>>>> origin/master
public ApiClient setDateFormat(DateFormat dateFormat) {
this.json.setDateFormat(dateFormat);
return this;