Skip to content

Commit

Permalink
fix: accidental git marker (#2039)
Browse files Browse the repository at this point in the history
With apologies for testing in "prod". Woops on the mistake.
  • Loading branch information
ludamad authored Sep 5, 2023
1 parent 85efd7f commit 2be9908
Showing 1 changed file with 0 additions and 4 deletions.
4 changes: 0 additions & 4 deletions build-system/scripts/deploy_ecr
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,7 @@
set -eu

REPOSITORY=$1
<<<<<<< HEAD
IMAGE_COMMIT_URI=$($(git rev-parse --show-toplevel)/build-system/scripts/calculate_image_uri $REPOSITORY)
=======
IMAGE_COMMIT_URI=$(calculate_image_uri $REPOSITORY)
>>>>>>> 6b93483312a1a65ddc941579c9322732c2774175

# Login to build region and pull the build.
retry_10 ensure_repo $REPOSITORY $ECR_REGION
Expand Down

0 comments on commit 2be9908

Please sign in to comment.