From b134a79df6c703d73677aa6ae9896a34a4903132 Mon Sep 17 00:00:00 2001
From: Mohammed-Yassine BOUMEHDI
 <115194839+MYassineBoum@users.noreply.github.com>
Date: Sun, 26 May 2024 13:46:15 +0100
Subject: [PATCH] Update sync-gitlab.yml

---
 .github/workflows/sync-gitlab.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/sync-gitlab.yml b/.github/workflows/sync-gitlab.yml
index 83b4394..4aa9684 100644
--- a/.github/workflows/sync-gitlab.yml
+++ b/.github/workflows/sync-gitlab.yml
@@ -32,5 +32,5 @@ jobs:
         GITLAB_ACCESS_TOKEN: ${{ secrets.GITLAB_ACCESS_TOKEN }}
       run: |
         git remote add gitlab "https://oauth2:${GITLAB_ACCESS_TOKEN}@${GITLAB_REPO}"
-        git pull gitlab mvn-multimodules --strategy-option theirs
+        git pull gitlab mvn-multimodules
         git push gitlab mvn-multimodules