chore: remove merge markers

Author: baileympearson

.evergreen/config.yml

@@ -2206,98 +2206,6 @@ post:
 ignore:
   - '*.md'
 buildvariants:
-<<<<<<< HEAD
-  - name: macos-1014-erbium
-    display_name: macOS 10.14 Node Erbium
-    run_on: macos-1014
-    expansions:
-      NODE_LTS_NAME: erbium
-      CLIENT_ENCRYPTION: true
-    tasks: &ref_0
-      - test-latest-server
-      - test-latest-replica_set
-      - test-latest-sharded_cluster
-      - test-6.0-server
-      - test-6.0-replica_set
-      - test-6.0-sharded_cluster
-      - test-5.0-server
-      - test-5.0-replica_set
-      - test-5.0-sharded_cluster
-      - test-4.4-server
-      - test-4.4-replica_set
-      - test-4.4-sharded_cluster
-      - test-4.2-server
-      - test-4.2-replica_set
-      - test-4.2-sharded_cluster
-      - test-4.0-server
-      - test-4.0-replica_set
-      - test-4.0-sharded_cluster
-      - test-3.6-server
-      - test-3.6-replica_set
-      - test-3.6-sharded_cluster
-      - test-latest-server-v1-api
-      - test-atlas-connectivity
-      - test-atlas-data-lake
-      - test-auth-kerberos
-      - test-auth-ldap
-      - test-socks5
-      - test-socks5-tls
-      - test-zstd-compression
-      - test-snappy-compression
-      - test-tls-support-latest
-      - test-tls-support-6.0
-      - test-tls-support-5.0
-      - test-tls-support-4.4
-      - test-tls-support-4.2
-  - name: macos-1014-fermium
-    display_name: macOS 10.14 Node Fermium
-    run_on: macos-1014
-    expansions:
-      NODE_LTS_NAME: fermium
-      CLIENT_ENCRYPTION: true
-    tasks: *ref_0
-  - name: macos-1014-gallium
-    display_name: macOS 10.14 Node Gallium
-    run_on: macos-1014
-    expansions:
-      NODE_LTS_NAME: gallium
-      CLIENT_ENCRYPTION: true
-    tasks:
-      - test-latest-server
-      - test-latest-replica_set
-      - test-latest-sharded_cluster
-      - test-6.0-server
-      - test-6.0-replica_set
-      - test-6.0-sharded_cluster
-      - test-5.0-server
-      - test-5.0-replica_set
-      - test-5.0-sharded_cluster
-      - test-4.4-server
-      - test-4.4-replica_set
-      - test-4.4-sharded_cluster
-      - test-4.2-server
-      - test-4.2-replica_set
-      - test-4.2-sharded_cluster
-      - test-4.0-server
-      - test-4.0-replica_set
-      - test-4.0-sharded_cluster
-      - test-3.6-server
-      - test-3.6-replica_set
-      - test-3.6-sharded_cluster
-      - test-latest-server-v1-api
-      - test-atlas-connectivity
-      - test-atlas-data-lake
-      - test-auth-kerberos
-      - test-auth-ldap
-      - test-socks5
-      - test-socks5-tls
-      - test-tls-support-latest
-      - test-tls-support-6.0
-      - test-tls-support-5.0
-      - test-tls-support-4.4
-      - test-tls-support-4.2
-=======
->>>>>>> 4078d1434 (test: reduce macos coverage)
   - name: ubuntu-18.04-erbium
     display_name: Ubuntu 18.04 Node Erbium
     run_on: ubuntu1804-large
@@ -2356,7 +2264,6 @@ buildvariants:
     expansions:
       NODE_LTS_NAME: gallium
       CLIENT_ENCRYPTION: true
-<<<<<<< HEAD
     tasks:
       - test-latest-server
       - test-latest-replica_set
@@ -2394,9 +2301,6 @@ buildvariants:
       - test-tls-support-5.0
       - test-tls-support-4.4
       - test-tls-support-4.2
-=======
-    tasks: *ref_0
->>>>>>> 4078d1434 (test: reduce macos coverage)
   - name: windows-64-vs2019-erbium
     display_name: Windows (VS2019) Node Erbium
     run_on: windows-64-vs2019-large
@@ -2449,7 +2353,6 @@ buildvariants:
     expansions:
       NODE_LTS_NAME: gallium
       MSVS_VERSION: 2019
-<<<<<<< HEAD
     tasks:
       - test-latest-server
       - test-latest-replica_set
@@ -2481,8 +2384,6 @@ buildvariants:
       - test-tls-support-5.0
       - test-tls-support-4.4
       - test-tls-support-4.2
-=======
-    tasks: *ref_1
   - name: macos-1100
     display_name: MacOS 11 Node Gallium
     run_on: macos-1100
@@ -2491,7 +2392,6 @@ buildvariants:
       CLIENT_ENCRYPTION: true
     tasks:
       - test-rapid-server
->>>>>>> 4078d1434 (test: reduce macos coverage)
   - name: lint
     display_name: lint
     run_on: ubuntu1804-large