From 6335179ac6293c07823e4f16185929ccdded2815 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jarno=20Kiesil=C3=A4inen?= <jarnokie@gmail.com>
Date: Thu, 7 Aug 2025 19:15:00 +0300
Subject: [PATCH] feat: removed backend pipeline step for caching m2

---
 .gitea/workflows/backend-ci.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitea/workflows/backend-ci.yml b/.gitea/workflows/backend-ci.yml
index e1136bc..e9d817e 100644
--- a/.gitea/workflows/backend-ci.yml
+++ b/.gitea/workflows/backend-ci.yml
@@ -25,11 +25,14 @@ jobs:
         java-version: '21'
         distribution: 'temurin'
         cache: 'maven'
+<<<<<<< HEAD
 
     - name: Set up Maven
       uses: stCarolas/setup-maven@v5
       with:
         maven-version: '3.6.3'
+=======
+>>>>>>> c5433df (feat: removed backend pipeline step for caching m2)
         
     - name: Run Maven tests
       working-directory: ./backend