Another test after 010f1cb

multitheftauto · Oct 4, 2023 · 25ca6a9 · 25ca6a9
1 parent f7ffc54
commit 25ca6a9
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/.github/workflows/sync-master-to-maetro.yaml b/.github/workflows/sync-master-to-maetro.yaml
@@ -35,6 +35,9 @@ jobs:
           # Discard d3dcompiler_47.dll conflicts (Due to old CEF version on maetro)
           git checkout --ours -- "Shared/data/MTA San Andreas/MTA/d3dcompiler_47.dll"
           git add --verbose "Shared/data/MTA San Andreas/MTA/d3dcompiler_47.dll"
+
+          git checkout --ours -- "Client/loader/MainFunctions.cpp"
+          git add --verbose "Client/loader/MainFunctions.cpp"
           
           # We should be done with the merge now
           printf "Synchronize changes from 1.6 master branch [ci skip]\n\n" > commit.txt