nvazquez commented on pull request #5170:
URL: https://github.com/apache/cloudstack/pull/5170#issuecomment-871592042


   Thanks @shwstppr I have resolved conflicts to merge 4.15 into main, did I 
miss those changes? Most of the conflicts were from this PR: 
https://github.com/apache/cloudstack/pull/5097 as the differs from 4.15 and 
main in those files


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: [email protected]

For queries about this service, please contact Infrastructure at:
[email protected]


Reply via email to