# Conflicts: # cocos/platform/mac/CCCanvasRenderingContext2D-mac.mm # cocos/scripting/js-bindings/manual/jsb_gfx_manual.cpp