Skip to content

Commit 2302fe1

Browse files
authored
Fix compile error for maetro
1 parent 4f7e0d8 commit 2302fe1

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

.github/workflows/sync-master-to-maetro.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,10 @@ jobs:
3636
git checkout --ours -- "Shared/data/MTA San Andreas/MTA/d3dcompiler_47.dll"
3737
git add --verbose "Shared/data/MTA San Andreas/MTA/d3dcompiler_47.dll"
3838
39+
# Discard cefweb conflicts
40+
git checkout --ours -- Client/cefweb/CWebView.cpp
41+
git add --verbose Client/cefweb/CWebView.cpp
42+
3943
git checkout --ours -- "Client/loader/MainFunctions.cpp"
4044
git add --verbose "Client/loader/MainFunctions.cpp"
4145

0 commit comments

Comments
 (0)