Merge branch 'NODE-6090' into NODE-6120

W-A-James · web-flow · commit 2ac36d44f2eb · 2024-05-29T17:02:16.000-04:00
diff --git a/src/index.ts b/src/index.ts
@@ -62,11 +62,8 @@ export {
   MongoNetworkError,
   MongoNetworkTimeoutError,
   MongoNotConnectedError,
-<<<<<<< NODE-6090 -- Incoming Change
-  MongoOperationTimeoutError,
-=======
   MongoOIDCError,
->>>>>>> main -- Current Change
+  MongoOperationTimeoutError,
   MongoParseError,
   MongoRuntimeError,
   MongoServerClosedError,
