Skip to content

Commit 0a34e37

Browse files
add managed field
1 parent 74612e7 commit 0a34e37

File tree

1 file changed

+0
-4
lines changed

1 file changed

+0
-4
lines changed

installer/install.sh

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -391,7 +391,6 @@ else
391391
fi
392392
echo ""
393393

394-
<<<<<<< Updated upstream
395394
# 4. Create argo-cd jwt token for events-reporter event-source
396395
create_argocd_token_secret
397396
echo ""
@@ -403,9 +402,6 @@ echo ""
403402
# Complete installation for non managed runtimes
404403
# a. create default git integration
405404
# b. register user to default git integration
406-
=======
407-
408-
>>>>>>> Stashed changes
409405
if [[ "$CSDP_MANAGED_RUNTIME" -ne "true" ]] ; then
410406
# 5. Check git integration
411407
echo "Checking default git integration..."

0 commit comments

Comments
 (0)