fix merge conflicts

Author: DreamBot706

deploy.sh

@@ -13,11 +13,7 @@ set -euo pipefail
 REPO_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 CLIENT_DIR="$REPO_DIR/client"
 SERVER_DIR="$REPO_DIR/server"
-<<<<<<< HEAD
-NGINX_WEB_ROOT="/var/www/coursehub"
-=======
 NGINX_WEB_ROOT="/var/www/coursehub/client"
->>>>>>> f385ff68fcab0ff89d8769e012a17c4ac23973fe
 PM2_APP_NAME="coursehub-backend"
 
 # ── Colours ─────────────────────────────────────────────────
@@ -54,12 +50,9 @@ deploy_frontend() {
     # Clear old build and copy new one
     sudo rm -rf "${NGINX_WEB_ROOT:?}"/*
     sudo cp -r "$CLIENT_DIR/dist/." "$NGINX_WEB_ROOT/"
-<<<<<<< HEAD
-=======
     log "Reloading nginx..."
     sudo systemctl reload nginx
     sudo nginx -s reload
->>>>>>> f385ff68fcab0ff89d8769e012a17c4ac23973fe
 
     success "Frontend deployed successfully!"
 }
@@ -106,12 +99,9 @@ case "$TARGET" in
         log "Replacing files in $NGINX_WEB_ROOT ..."
         sudo rm -rf "${NGINX_WEB_ROOT:?}"/*
         sudo cp -r "$CLIENT_DIR/dist/." "$NGINX_WEB_ROOT/"
-<<<<<<< HEAD
-=======
         log "Reloading nginx..."
         sudo systemctl reload nginx
         sudo nginx -s reload
->>>>>>> f385ff68fcab0ff89d8769e012a17c4ac23973fe
         success "Frontend deployed!"
 
         # Backend