Closed chusitoo closed 4 months ago
Implemented as per discussion https://github.com/open-telemetry/opentelemetry-cpp/issues/2047#issuecomment-1870815587:
Resolved the conflict on .clang-format when merging from main (using web browser, not command line), not sure why this file still shows as rewritten by the PR.
edit: this was because of unix / dos end of lines
Implemented as per discussion https://github.com/open-telemetry/opentelemetry-cpp/issues/2047#issuecomment-1870815587: