Fixed conflict

This commit is contained in:
Kasra Bigdeli
2024-10-19 10:53:43 -07:00
2 changed files with 7 additions and 0 deletions

View File

@@ -44,7 +44,11 @@ echo $IMAGE_NAME:$CAPROVER_VERSION
echo "**************************************"
echo "**************************************"
<<<<<<< HEAD
FRONTEND_COMMIT_HASH=cd916c53c4b15ec3f71863075dc4d2a729e2266e
=======
FRONTEND_COMMIT_HASH=9f6c377137088c10b5582c4c9cd8285a9bd450d9
>>>>>>> release
## Building frontend app
ORIG_DIR=$(pwd)