From 6aa704c31f2489e60aa3d1cd0d5ce1ec014b907a Mon Sep 17 00:00:00 2001
From: William Schultz <william.schultz@mongodb.com>
Date: Wed, 21 Feb 2018 15:48:16 -0500
Subject: Fix merge conflict in op_observer_impl_test

---
 src/mongo/db/op_observer_impl_test.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/mongo/db/op_observer_impl_test.cpp b/src/mongo/db/op_observer_impl_test.cpp
index 094b5f71430..72917228aaf 100644
--- a/src/mongo/db/op_observer_impl_test.cpp
+++ b/src/mongo/db/op_observer_impl_test.cpp
@@ -268,7 +268,7 @@ public:
                               NamespaceString nss,
                               TxnNumber txnNum,
                               StmtId stmtId) {
-        session->beginTxn(opCtx, txnNum);
+        session->beginOrContinueTxn(opCtx, txnNum, boost::none);
 
         {
             AutoGetCollection autoColl(opCtx, nss, MODE_IX);
-- 
cgit v1.2.1