Fix

Author: mcmorisi

source/security.txt

@@ -445,30 +445,19 @@ Windows
 
             .. code-block:: python
 
-<<<<<<< HEAD
-               client = pymongo.MongoClient("mongodb://<hostname>:<port>",
-                                            username="<db_username>",
-                                            authMechanism="GSSAPI",
-                                            password="<db_password>",
-                                            authMechanismProperties="SERVICE_NAME:<authentication service name>,
-                                                CANONICALIZE_HOST_NAME:true,
-                                                SERVICE_REALM:<service realm>")
-=======
          client = pymongo.MongoClient("mongodb://<hostname>:<port>",
                                        username="<username>",
                                        authMechanism="GSSAPI",
                                        password="<password>",
                                        authMechanismProperties="SERVICE_NAME:<authentication service name>,
                                            CANONICALIZE_HOST_NAME:true,
                                            SERVICE_REALM:<service realm>")
->>>>>>> fc4211c (DOCSP-48719: Update non-Mongo credential placeholders (#240))
 
          .. tab:: Connection String
             :tabid: connectionstring
 
             .. code-block:: python
 
-<<<<<<< HEAD
                uri = ("mongodb://<percent-encoded username>:<percent-encoded user password>"
                       "@<hostname>:<port>/?"
                       "&authMechanism=GSSAPI"
@@ -477,43 +466,6 @@ Windows
                         "CANONICALIZE_HOST_NAME:true,"
                         "SERVICE_REALM:<service realm>")
                client = pymongo.MongoClient(uri)
-=======
-         uri = ("mongodb://<percent-encoded username>:<percent-encoded user password>"
-                  "@<hostname>:<port>/?"
-                  "&authMechanism=GSSAPI"
-                  "&authMechanismProperties="
-                  "SERVICE_NAME:<authentication service name>,"
-                  "CANONICALIZE_HOST_NAME:true,"
-                  "SERVICE_REALM:<service realm>")
-         client = pymongo.MongoClient(uri)
-
-   .. tab:: MongoClient (Asynchronous)
-      :tabid: mongoclient-async
-
-      .. code-block:: python
-
-         client = pymongo.AsyncMongoClient("mongodb://<hostname>:<port>",
-                                           username="<username>",
-                                           authMechanism="GSSAPI",
-                                           password="<password>",
-                                           authMechanismProperties="SERVICE_NAME:<authentication service name>,
-                                               CANONICALIZE_HOST_NAME:true,
-                                               SERVICE_REALM:<service realm>")
-
-   .. tab:: Connection String (Asynchronous)
-      :tabid: connectionstring-async
-
-      .. code-block:: python
-
-         uri = ("mongodb://<percent-encoded username>:<percent-encoded user password>"
-                  "@<hostname>:<port>/?"
-                  "&authMechanism=GSSAPI"
-                  "&authMechanismProperties="
-                  "SERVICE_NAME:<authentication service name>,"
-                  "CANONICALIZE_HOST_NAME:true,"
-                  "SERVICE_REALM:<service realm>")
-         client = pymongo.AsyncMongoClient(uri)
->>>>>>> fc4211c (DOCSP-48719: Update non-Mongo credential placeholders (#240))
 
 To learn more about authenticating with Kerberos, see
 :ref:`pymongo-kerberos` in the Enterprise Authentication guide.