usdot-fhwa-stol / cda-telematics

Apache License 2.0

1 stars 2 forks source link

Resolve Merge conflicts #251

Closed SaikrishnaBairamoni closed 1 month ago

SaikrishnaBairamoni commented 1 month ago

PR Details

Resolved merge conflicts between release/neon and master

Description

Related GitHub Issue

Related Jira Key

Motivation and Context

How Has This Been Tested?

Types of changes

[x] Defect fix (non-breaking change that fixes an issue)
[ ] New feature (non-breaking change that adds functionality)
[ ] Breaking change (fix or feature that cause existing functionality to change)

Checklist:

[ ] I have added any new packages to the sonar-scanner.properties file
[ ] My change requires a change to the documentation.
[x] I have updated the documentation accordingly.
[x] I have read the CONTRIBUTING document.
[ ] I have added tests to cover my changes.
[ ] All new and existing tests passed.

SaikrishnaBairamoni commented 1 month ago

addressed by PR 257