We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
There was an error while loading. Please reload this page.
1 parent 4f7e0d8 commit 2302fe1Copy full SHA for 2302fe1
.github/workflows/sync-master-to-maetro.yaml
@@ -36,6 +36,10 @@ jobs:
36
git checkout --ours -- "Shared/data/MTA San Andreas/MTA/d3dcompiler_47.dll"
37
git add --verbose "Shared/data/MTA San Andreas/MTA/d3dcompiler_47.dll"
38
39
+ # Discard cefweb conflicts
40
+ git checkout --ours -- Client/cefweb/CWebView.cpp
41
+ git add --verbose Client/cefweb/CWebView.cpp
42
+
43
git checkout --ours -- "Client/loader/MainFunctions.cpp"
44
git add --verbose "Client/loader/MainFunctions.cpp"
45
0 commit comments