fix some merge issues

hsubox76 · hsubox76 · commit 7b44f66af7b0 · 2024-09-30T13:26:10.000-07:00
diff --git a/packages/vertexai/src/requests/schema-builder.ts b/packages/vertexai/src/requests/schema-builder.ts
@@ -211,14 +211,6 @@ export class StringSchema extends Schema {
     }
     return obj as SchemaRequest;
   }
-
-  toJSON(): _SchemaRequest {
-    const obj = super.toJSON();
-    if (this.enum) {
-      obj['enum'] = this.enum;
-    }
-    return obj as SchemaRequest;
-  }
 }
 
 /**
diff --git a/yarn.lock b/yarn.lock
@@ -12854,11 +12854,6 @@ node-forge@^0.10.0:
   resolved "https://registry.npmjs.org/node-forge/-/node-forge-0.10.0.tgz"
   integrity sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA==
 
-node-forge@^0.10.0:
-  version "0.10.0"
-  resolved "https://registry.npmjs.org/node-forge/-/node-forge-0.10.0.tgz"
-  integrity sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA==
-
 node-forge@^1.3.1:
   version "1.3.1"
   resolved "https://registry.npmjs.org/node-forge/-/node-forge-1.3.1.tgz"

Original file line number	Diff line number	Diff line change
`@@ -211,14 +211,6 @@ export class StringSchema extends Schema {`
`211`	`211`	`}`
`212`	`212`	`return obj as SchemaRequest;`
`213`	`213`	`}`
`214`		`-`
`215`		`- toJSON(): _SchemaRequest {`
`216`		`- const obj = super.toJSON();`
`217`		`- if (this.enum) {`
`218`		`- obj['enum'] = this.enum;`
`219`		`- }`
`220`		`- return obj as SchemaRequest;`
`221`		`- }`
`222`	`214`	`}`
`223`	`215`
`224`	`216`	`/**`