From 1aab8e71df48c62abdab92ac955c7a8257b24f2d Mon Sep 17 00:00:00 2001
From: Jordan Dialpuri <44945647+Dialpuri@users.noreply.github.com>
Date: Mon, 20 Nov 2023 08:48:11 +0000
Subject: [PATCH] Update frontend_merge.yml

---
 .github/workflows/frontend_merge.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/frontend_merge.yml b/.github/workflows/frontend_merge.yml
index 929ce585..a4499d95 100644
--- a/.github/workflows/frontend_merge.yml
+++ b/.github/workflows/frontend_merge.yml
@@ -29,10 +29,10 @@ jobs:
         uses: SamKirkland/FTP-Deploy-Action@v4.3.4
         with:
           server: ${{ secrets.ftp_server_ip}}
-          username: ${{ secrets.ftp_username }}@privateer.hosted.york.ac.uk
+          username: ${{ secrets.ftp_username }}@privateer.york.ac.uk
           password: ${{ secrets.ftp_password }}
           protocol: ftps
           port: 21
           local-dir: webserver/public_html/
           server-dir: ${{ secrets.ftp_server_dir }}/
-          
\ No newline at end of file
+