From 1a8b908533d2571b7100f66270a5162d6c3cbc89 Mon Sep 17 00:00:00 2001
From: Lucy Ciara Herud-Thomassen <lucych@stud.ntnu.no>
Date: Thu, 26 Feb 2026 11:52:50 +0100
Subject: [PATCH] fix[pom]: remove artifacts from merge conflict that was
 improperly removed

---
 pom.xml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 1873d07..b0f6764 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,16 +32,12 @@
             <artifactId>javafx-controls</artifactId>
             <version>${javafx.version}</version>
         </dependency>
-<<<<<<< HEAD
-
         <!-- https://mvnrepository.com/artifact/org.springframework.security/spring-security-crypto -->
         <dependency>
           <groupId>org.springframework.security</groupId>
           <artifactId>spring-security-crypto</artifactId>
           <version>7.0.2</version>
         </dependency>
-=======
->>>>>>> main
     </dependencies>
 
     <build>