# Conflicts: # entry/src/main/cpp/sdk/judge/sub3/Sub3Judge20Comm.cpp # entry/src/main/ets/common/utils/FileConfig.ts # entry/src/main/ets/common/utils/SerialPortClient.ts # entry/src/main/ets/common/utils/request.ts
# Conflicts: # entry/src/main/cpp/sdk/judge/sub3/Sub3Judge20Comm.cpp # entry/src/main/ets/common/utils/FileConfig.ts # entry/src/main/ets/common/utils/SerialPortClient.ts # entry/src/main/ets/common/utils/request.ts