usdot-fhwa-stol / cda-telematics

Apache License 2.0

1 stars 2 forks source link

Fix merge conflicts 2 #253

Closed adev4a closed 1 month ago

adev4a commented 1 month ago

PR Details

This PR addresses merge conflicts from neon release candidate into master. It was seen that following carma-system-4.4.0 release the changes merged into master were not updated on develop causing a divergence of the two branches. Since these were configuration changes made on master that were updated for new implementation, they were removed to keep the tested functionality.

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.
[ ] 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.