fix: adjust for merge conflicts

mongodb-js · Jun 1, 2022 · ccd8f6d · ccd8f6d
1 parent b7f2435
commit ccd8f6d
Show file tree

Hide file tree

Showing 17 changed files with 3,815 additions and 3,815 deletions.
diff --git a/packages/async-rewriter2/package-lock.json b/packages/async-rewriter2/package-lock.json
diff --git a/packages/autocomplete/package-lock.json b/packages/autocomplete/package-lock.json
diff --git a/packages/browser-repl/package-lock.json b/packages/browser-repl/package-lock.json
diff --git a/packages/browser-runtime-core/package-lock.json b/packages/browser-runtime-core/package-lock.json
diff --git a/packages/browser-runtime-electron/package-lock.json b/packages/browser-runtime-electron/package-lock.json
diff --git a/packages/build/package-lock.json b/packages/build/package-lock.json
diff --git a/packages/cli-repl/src/crypt-library-paths.spec.ts b/packages/cli-repl/src/crypt-library-paths.spec.ts
@@ -1,5 +1,5 @@
 import { expect } from 'chai';
-import { SHARED_LIBRARY_SUFFIX, getCryptLibraryPaths } from './csfle-library-paths';
+import { SHARED_LIBRARY_SUFFIX, getCryptLibraryPaths } from './crypt-library-paths';
 import cryptLibraryDummy from 'mongodb-crypt-library-dummy';
 import type { MongoshBus } from '@mongosh/types';
 import { useTmpdir } from '../test/repl-helpers';

diff --git a/packages/editor/package-lock.json b/packages/editor/package-lock.json
diff --git a/packages/history/package-lock.json b/packages/history/package-lock.json
diff --git a/packages/i18n/package-lock.json b/packages/i18n/package-lock.json