fix merge

Author: nitins17

ci/envs/default.env

@@ -45,15 +45,9 @@ export JAXCI_OUTPUT_DIR="$(pwd)/dist"
 export JAXCI_BUILD_ARTIFACT_WITH_RBE=${JAXCI_BUILD_ARTIFACT_WITH_RBE:-0}
 
 # On platforms where RBE is not supported, we use Bazel remote cache to speed up
-<<<<<<< HEAD
-# builds. When this flag is enabled, the build will also try to push new cache entries
-# to the bucket. Since writes to the bucket require authentication, this flag is enabled
-# only for CI builds.
-=======
 # builds. When this flag is enabled, Bazel will also try to push new cache
 # entries to the bucket. Since writes to the bucket require authentication, this
 # flag is enabled only for CI builds.
->>>>>>> 14246134e7f2ec1ae4eaba8a70315a0fc2e73cd4
 export JAXCI_WRITE_TO_BAZEL_REMOTE_CACHE=${JAXCI_WRITE_TO_BAZEL_REMOTE_CACHE:-0}
 
 # #############################################################################
@@ -71,9 +65,6 @@ export JAXCI_MAX_TESTS_PER_GPU=${JAXCI_MAX_TESTS_PER_GPU:-12}
 export JAXCI_ENABLE_X64=${JAXCI_ENABLE_X64:-0}
 
 # Pytest specific environment variables below. Used in run_pytest_*.sh scripts.
-# Installing the JAX package in editable mode at the current commit
-export JAXCI_INSTALL_JAX_CURRENT_COMMIT=${JAXCI_INSTALL_JAX_CURRENT_COMMIT:-}
-
 # Sets the number of TPU cores for the TPU machine type. These values are
 # defined in the TPU GitHub Actions workflow.
 export JAXCI_TPU_CORES=${JAXCI_TPU_CORES:-}
@@ -86,4 +77,4 @@ export JAXCI_PYTHON=${JAXCI_PYTHON:-python${JAXCI_HERMETIC_PYTHON_VERSION}}
 # Installs the JAX package in editable mode at the current commit. Enabled by
 # default. Nightly/Release builds disable this flag in the Github action
 # workflow files.
-export JAXCI_INSTALL_JAX_CURRENT_COMMIT=${JAXCI_INSTALL_JAX_CURRENT_COMMIT:-"1"}
+export JAXCI_INSTALL_JAX_CURRENT_COMMIT=${JAXCI_INSTALL_JAX_CURRENT_COMMIT:-"1"}