[CXX-2364] Remove git merge markers from docs/content/mongocxx-v3/client-side-encryption.md Created: 02/Sep/21  Updated: 28/Oct/23  Resolved: 08/Sep/21

Status: Closed
Project: C++ Driver
Component/s: Documentation
Affects Version/s: None
Fix Version/s: 3.7.0, 3.7.0-beta1

Type: Bug Priority: Trivial - P5
Reporter: Mark Benvenuto Assignee: Mark Benvenuto
Resolution: Fixed Votes: 0
Labels: None
Remaining Estimate: Not Specified
Time Spent: Not Specified
Original Estimate: Not Specified


 Description   

https://github.com/mongodb/mongo-cxx-driver/blob/915586cb5a87524b1f1dc3944b38becd53391013/docs/content/mongocxx-v3/client-side-encryption.md#L86-L87

has git merge markers in the file (i.e. <<<<<< HEAD). These should be removed to improve readability of the documentation.



 Comments   
Comment by Githook User [ 07/Sep/21 ]

Author:

{'name': 'Mark Benvenuto', 'email': 'markbenvenuto@users.noreply.github.com', 'username': 'markbenvenuto'}

Message: CXX-2364 Remove git merge markers from docs/content/mongocxx-v3/client-side-encryption.md (#824)
Branch: master
https://github.com/mongodb/mongo-cxx-driver/commit/c13ca66acfb00c98f0ced8cf979d27f3bf888223

Generated at Wed Feb 07 22:05:41 UTC 2024 using Jira 9.7.1#970001-sha1:2222b88b221c4928ef0de3161136cc90c8356a66.