message: Fix do_ci.sh merge.
diff: @@ -270,21 +270,6 @@ elif [[ "$CI_TARGET" == "bazel.compile_time_options" ]]; then
  # Right now, none of the available compile-time options conflict with each other. If this
  # changes, this build type may need to be broken up.
  # TODO(mpwarres): remove quiche=enabled once QUICHE is built by default.
  -<<<<<<< HEAD
  - COMPILE_TIME_OPTIONS="\
  - --define signal_trace=disabled \
  - --define hot_restart=disabled \
  - --define google_grpc=disabled \
  - --define boringssl=fips \
  - --define log_debug_assert_in_release=enabled \
  - --define quiche=enabled \
  - --define wasm=enabled \
  - --define path_normalization_by_default=true \
  - --define deprecated_features=disabled \
  - --define use_new_codecs_in_integration_tests=true \
  - --define zlib=ng \
  - "
  -=======
  COMPILE_TIME_OPTIONS=(
  "--define" "signal_trace=disabled"
  "--define" "hot_restart=disabled"
  @@ -292,12 +277,12 @@ elif [[ "$CI_TARGET" == "bazel.compile_time_options" ]]; then
  "--define" "boringssl=fips"
  "--define" "log_debug_assert_in_release=enabled"
  "--define" "quiche=enabled"
  + "--define" "wasm=enabled"
  "--define" "path_normalization_by_default=true"
  "--define" "deprecated_features=disabled"
  "--define" "use_new_codecs_in_integration_tests=true"
  "--define" "zlib=ng")
  ->>>>>>> envoyproxy/master
  ENVOY_STDLIB="${ENVOY_STDLIB:-libstdc++}"
  setup_clang_toolchain
  # This doesn't go into CI but is available for developer convenience.
  