merger conflickt fix (#548)

Author: kyuan-mongodb

snooty.toml

@@ -27,14 +27,9 @@ toc_landing_pages = [
 ]
 
 [constants]
-<<<<<<< HEAD
 download-page = "`downloads page <https://www.mongodb.com/try/download/compass>`__"
 current-version = "1.39.3"
 atlas = "MongoDB Atlas"
-=======
-download-page = "`downloads page <https://www.mongodb.com/download-center/compass?tck=docs_compass>`__"
-current-version = "1.33.1"
->>>>>>> cce057b ((DOCSP-25037): 1.33.1 release notes (#428))
 
 [[banners]]
 targets = [

source/release-notes.txt

@@ -10,7 +10,6 @@ Release Notes
    :depth: 1
    :class: twocols
 
-<<<<<<< HEAD
 |compass| 1.39.4
 ----------------
 
@@ -494,8 +493,6 @@ Bug Fixes:
 `Full changelog available on GitHub
 <https://github.com/mongodb-js/compass/compare/v1.33.1...v1.34.0>`__.
 
-=======
->>>>>>> cce057b ((DOCSP-25037): 1.33.1 release notes (#428))
 |compass| 1.33.1
 ----------------