From 0811a9ab4d697312d3669f6f3f4d6ecbb7bcc5ea Mon Sep 17 00:00:00 2001
From: c22122192 <XiaoX16@cardiff.ac.uk>
Date: Thu, 28 Nov 2024 12:30:55 +0000
Subject: [PATCH] Merge remote-tracking branch 'origin/28-registration-feature'
 into 28-registration-feature

---
 src/main/resources/templates/page/register.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/templates/page/register.html b/src/main/resources/templates/page/register.html
index 7264625..9ed64dd 100644
--- a/src/main/resources/templates/page/register.html
+++ b/src/main/resources/templates/page/register.html
@@ -6,7 +6,7 @@
   <title>User Registration</title>
   <link rel="stylesheet" href="../../css/index.css">
   <script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
-  <script src="/js/bcrypt.min.js"></script>
+<!--  <script src="/js/bcrypt.min.js"></script>-->
   <script src="https://cdn.bootcdn.net/ajax/libs/bcryptjs/2.4.3/bcrypt.min.js"></script>
 <!--  <script src="https://cdn.jsdelivr.net/npm/bcrypt@5.1.1/bcrypt.min.js"></script>-->
 </head>
-- 
GitLab