Fix compile error for maetro

Lpsd · May 24, 2024 · 2302fe1 · 2302fe1
1 parent 4f7e0d8
commit 2302fe1
Showing 1 changed file with 4 additions and 0 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"