fix to transactions file

Author: caitlindavey

source/fundamentals/transactions.txt

@@ -93,20 +93,6 @@ following table describes these methods:
          error if there is no active transaction for the session or if the
          transaction was ended. To learn more about
          this method, see the :manual:`commitTransaction() page
-<<<<<<< HEAD
-         </reference/method/Session.commitTransaction/>`  in the Server manual.
-
-       .. note:: Retrying a Transaction
-
-          The ``CommitTransaction()`` method is an idempotent function, which
-          means that you can attempt to commit a transaction multiple times
-          without changing data after the first successful commit.
-
-          A transaction can succeed but return an error with the
-          ``UnknownTransactionCommitResult`` label. If you rerun the
-          ``CommitTransaction()`` method after receiving this error,
-          your data is not changed by the repeat attempts.
-=======
          </reference/method/Session.commitTransaction/>`  in the Server manual. 
        |
        | The ``CommitTransaction()`` method is an idempotent function, which 
@@ -115,7 +101,6 @@ following table describes these methods:
          ``UnknownTransactionCommitResult`` label. If you rerun the
          ``CommitTransaction()`` method after receiving this error,
          your data is not changed by the repeat attempts.
->>>>>>> cb6466d (Docsp 42960 nested components (#387))
 
        |
        | **Parameter**: ``Context``