Conflict: This file was modified in both the source and target branches.
Ask someone with write access to resolve it.
@@ -106,6 +106,8 @@ export const {{classname}}AxiosParamCreator = function (configuration?: Configur
@@ -125,6 +127,8 @@ export const {{classname}}AxiosParamCreator = function (configuration?: Configur