Copilot commented on code in PR #8831: URL: https://github.com/apache/texera/pull/8831#discussion_r4172809634
########## LICENSE: ########## @@ -254,3 +254,29 @@ build: Copyright (c) 2016-present, Yarn Contributors Source: https://github.com/yarnpkg/berry License: BSD 2-Clause License (licenses-3rd-party-code/yarn.txt) +<<<<<<< HEAD +======= Review Comment: Resolve this backport conflict before merging. The source-release step archives `LICENSE` unchanged, so the markers here and at line 282 would ship in the release. Retain the Iris attribution, remove all three markers, and omit the incoming Apple trademark section: this branch contains neither the named SVG nor the referenced “Continue with Apple” implementation. -- 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]
