andrijapanicsb commented on PR #8272: URL: https://github.com/apache/cloudstack/pull/8272#issuecomment-6910248699
@jbampton I merged the current `main` into your branch to clear the conflicts (a merge commit on top, nothing rewritten or force-pushed). Where both sides changed the same line I kept the code from `main` and re-applied your spelling fix on it, including the `Dettach...` to `Detach...` renames. The touched modules compile and their unit tests pass locally. -- 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]
