Merge dev into main, resolved bootstrap.sh conflicts

akhil27051999 · akhil27051999 · commit 7b910eaf1c36 · 2025-09-13T08:56:57.000Z
diff --git a/bootstrap.sh b/bootstrap.sh
@@ -83,10 +83,6 @@ main() {
     install_postgres_client
     install_docker
     install_kubernetes_tools
-<<<<<<< HEAD
-=======
-
->>>>>>> dev
     log "Bootstrap completed!"
     log "Please log out and log back in (or run 'newgrp docker') to use Docker without sudo."
     log "Run 'minikube start --driver=docker --nodes 3' to start your Kubernetes cluster."
