usdot-fhwa-stol / carma-msgs

ROS Message definitions used by the CARMA Platform

6 stars 9 forks source link

Merge release/lavida (4.5.0) branch into master #229

Closed paulbourelly999 closed 6 months ago

paulbourelly999 commented 6 months ago

PR Details

Description

Required #228 to close first

Related GitHub Issue

Related Jira Key

Motivation and Context

How Has This Been Tested?

Types of changes

[ ] 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.
[ ] I have read the CONTRIBUTING document.
[ ] I have added tests to cover my changes.
[ ] All new and existing tests passed. @MishkaMN

paulbourelly999 commented 6 months ago

@MishkaMN Please resolve merge conflicts

MishkaMN commented 6 months ago

Looks like the conflicts will be resolved if https://github.com/usdot-fhwa-stol/carma-msgs/pull/228 is merged: