Merge branch 'master' of https://github.com/multitheftauto/mtasa-blue

Lpsd · May 24, 2024 · 181bf0f · 181bf0f
2 parents 8a11b3c + 2302fe1
commit 181bf0f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1,158 deletions.
diff --git a/.github/workflows/sync-master-to-maetro.yaml b/.github/workflows/sync-master-to-maetro.yaml
@@ -36,6 +36,10 @@ jobs:
           git checkout --ours -- "Shared/data/MTA San Andreas/MTA/d3dcompiler_47.dll"
           git add --verbose "Shared/data/MTA San Andreas/MTA/d3dcompiler_47.dll"
 
+          # Discard cefweb conflicts
+          git checkout --ours -- Client/cefweb/CWebView.cpp
+          git add --verbose Client/cefweb/CWebView.cpp
+
           git checkout --ours -- "Client/loader/MainFunctions.cpp"
           git add --verbose "Client/loader/MainFunctions.cpp"