chore: fix merge conflict in pom.xml

.github/workflows/main.yaml

@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - main
+      - release/*
   workflow_dispatch: # Allows manual triggering of the workflow
 
 
@@ -33,16 +34,6 @@ jobs:
           java-version: '25'
       - name: Run Tests
         run: mvn clean test
-      - name: Upload Test Results
-        uses: actions/upload-artifact@v3
-        with:
-          name: surefire-reports
-          path: target/surefire-reports/
-      - name: Upload Coverage Report
-        uses: actions/upload-artifact@v3
-        with:
-          name: jacoco-report
-          path: target/jacoco/coverage-reports/jacoco.xml
 
   package:
     name: Package
@@ -62,15 +53,4 @@ jobs:
           name: packaged-app
           path: target/Help-Me-Help-1.0-SNAPSHOT-jar-with-dependencies.jar
 
-  deployPages:
-    environment:
-      name: github-pages
-      url: ${{ steps.deployment.outputs.page_url }}
-    runs-on: self-hosted
-    steps:
-      - uses: actions/checkout@v3
-      - name: Set up JDK
-        uses: actions/setup-java@v3
-        with:
-          distribution: 'temurin'
-          java-version: '25'
+

.gitignore

@@ -7,6 +7,7 @@
 *.war
 *.ear
 *.nar
+target/
 
 ##############################
 ## Maven
@@ -37,3 +38,8 @@ out/
 ##############################
 *.db
 *.DS_Store
+
+##############################
+## VSCode
+##############################
+.vscode/

pom.xml

@@ -32,7 +32,6 @@
             <artifactId>javafx-controls</artifactId>
             <version>${javafx.version}</version>
         </dependency>
-
         <!-- https://mvnrepository.com/artifact/org.springframework.security/spring-security-crypto -->
         <dependency>
           <groupId>org.springframework.security</groupId>