Skip to content

Commit fe2bebc

Browse files
committed
Remove stray ai.ts
1 parent 291c53b commit fe2bebc

File tree

2 files changed

+0
-165
lines changed

2 files changed

+0
-165
lines changed

packages/vertexai/src/api.test.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -111,11 +111,7 @@ describe('Top level API', () => {
111111
});
112112
it('getGenerativeModel with HybridParams honors a model override', () => {
113113
const genModel = getGenerativeModel(fakeVertexAI, {
114-
<<<<<<< HEAD
115114
mode: 'prefer_on_device',
116-
=======
117-
mode: 'only_in_cloud',
118-
>>>>>>> 814a1dc95 (Use type for inference mode and update docs)
119115
inCloudParams: { model: 'my-model' }
120116
});
121117
expect(genModel.model).to.equal('publishers/google/models/my-model');

packages/vertexai/src/types/ai.ts

Lines changed: 0 additions & 161 deletions
This file was deleted.

0 commit comments

Comments
 (0)