Skip to content

Commit fdd25fe

Browse files
committed
fix: fix merge conflicts
Signed-off-by: dhmlau <[email protected]>
1 parent 20bc47f commit fdd25fe

File tree

1 file changed

+0
-16
lines changed

1 file changed

+0
-16
lines changed

test/mongodb.test.js

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1337,15 +1337,7 @@ describe('mongodb connector', function() {
13371337
function(err, updatedusers) {
13381338
should.exist(err);
13391339
err.name.should.equal('MongoServerError');
1340-
<<<<<<< HEAD
1341-
err.errmsg.should.equal(
1342-
'The dollar ($) prefixed ' +
1343-
"field '$rename' in '$rename' is not allowed in the context of an update's replacement document. " +
1344-
'Consider using an aggregation pipeline with $replaceWith.',
1345-
);
1346-
=======
13471340
err.errmsg.should.match(/The dollar \(\$\) prefixed field \'\$rename\' in \'\$rename\' is not allowed/);
1348-
>>>>>>> 613cfe7 (feat: upgrade mongodb driver to version 5.x)
13491341
done();
13501342
},
13511343
);
@@ -1399,15 +1391,7 @@ describe('mongodb connector', function() {
13991391
function(err, updatedusers) {
14001392
should.exist(err);
14011393
err.name.should.equal('MongoServerError');
1402-
<<<<<<< HEAD
1403-
err.errmsg.should.equal(
1404-
'The dollar ($) prefixed ' +
1405-
"field '$rename' in '$rename' is not allowed in the context of an update's replacement document. " +
1406-
'Consider using an aggregation pipeline with $replaceWith.',
1407-
);
1408-
=======
14091394
err.errmsg.should.match(/The dollar \(\$\) prefixed field \'\$rename\' in \'\$rename\' is not allowed/);
1410-
>>>>>>> 613cfe7 (feat: upgrade mongodb driver to version 5.x)
14111395
done();
14121396
},
14131397
);

0 commit comments

Comments
 (0)