resolve conflict during rebase

2015-04-06 18:03:15 +08:00
parent 2bb42a1147
commit 3811a5a209
21 changed files with 266 additions and 88 deletions
--- a/modules/swagger-codegen/src/main/resources/php/api.mustache
+++ b/modules/swagger-codegen/src/main/resources/php/api.mustache
@@ -19,6 +19,9 @@
 *
 * NOTE: This class is auto generated by the swagger code generator program. Do not edit the class manually.
 */
+
+namespace {{invokerPackage}};
+
 {{#operations}}
 class {{classname}} {