mirror of
https://github.com/caprover/caprover
synced 2025-12-12 06:15:40 +00:00
Fixed conflict
This commit is contained in:
@@ -44,11 +44,7 @@ echo $IMAGE_NAME:$CAPROVER_VERSION
|
||||
echo "**************************************"
|
||||
echo "**************************************"
|
||||
|
||||
<<<<<<< HEAD
|
||||
FRONTEND_COMMIT_HASH=cd916c53c4b15ec3f71863075dc4d2a729e2266e
|
||||
=======
|
||||
FRONTEND_COMMIT_HASH=9f6c377137088c10b5582c4c9cd8285a9bd450d9
|
||||
>>>>>>> release
|
||||
|
||||
## Building frontend app
|
||||
ORIG_DIR=$(pwd)
|
||||
|
||||
Reference in New Issue
Block a user