docs(NODE-3419): fix typo in new error classes

andymina · andymina · commit 2ea2e84e4dac · 2021-07-12T11:47:49.000-04:00
diff --git a/src/error.ts b/src/error.ts
@@ -431,6 +431,7 @@ export class MongoGridFSChunkError extends MongoStreamError {
 }
 
 /**
+<<<<<<< HEAD
  * An error thrown when the user attempts to add options to a cursor that has already been
  * initialized
  *
@@ -448,6 +449,9 @@ export class MongoCursorInUseError extends MongoCursorError {
 }
 
 /** An error generated when an attempt to access a resource
+=======
+ * An error generated when an attempt is made to access a resource
+>>>>>>> f941c797b (docs(NODE-3419): fix typo in new error classes)
  * which has already been or will be closed/destroyed.
  *
  * @public

Original file line number	Diff line number	Diff line change
`@@ -431,6 +431,7 @@ export class MongoGridFSChunkError extends MongoStreamError {`
`431`	`431`	`}`
`432`	`432`
`433`	`433`	`/**`
	`434`	`+<<<<<<< HEAD`
`434`	`435`	`* An error thrown when the user attempts to add options to a cursor that has already been`
`435`	`436`	`* initialized`
`436`	`437`	`*`
`@@ -448,6 +449,9 @@ export class MongoCursorInUseError extends MongoCursorError {`
`448`	`449`	`}`
`449`	`450`
`450`	`451`	`/** An error generated when an attempt to access a resource`
	`452`	`+=======`
	`453`	`+ * An error generated when an attempt is made to access a resource`
	`454`	`+>>>>>>> f941c797b (docs(NODE-3419): fix typo in new error classes)`
`451`	`455`	`* which has already been or will be closed/destroyed.`
`452`	`456`	`*`
`453`	`457`	`* @public`