healchow commented on code in PR #8731: URL: https://github.com/apache/inlong/pull/8731#discussion_r1294670826
########## licenses/inlong-manager/LICENSE: ########## @@ -587,7 +587,7 @@ The text of each license is the standard Apache 2.0 license. org.apache.twill:twill-discovery-api:0.6.0-incubating - Apache Twill discovery service API (https://twill.apache.org/), (The Apache Software License, Version 2.0) org.apache.twill:twill-discovery-core:0.6.0-incubating - Apache Twill discovery service implementations (https://twill.apache.org/), (The Apache Software License, Version 2.0) org.apache.twill:twill-zookeeper:0.6.0-incubating - Apache Twill ZooKeeper client library (https://twill.apache.org/), (The Apache Software License, Version 2.0) - com.fasterxml.woodstox:woodstox-core:5.0.3 - Woodstox (https://github.com/FasterXML/woodstox/tree/woodstox-core-5.0.3), (The Apache License, Version 2.0) + com.fasterxml.woodstox:woodstox-core:5.4.0 - Woodstox (https://github.com/FasterXML/woodstox/tree/woodstox-core-5.0.3), (The Apache License, Version 2.0) Review Comment: You can refer to the following commands. ``` git pull upstream master --rebase // ... resolve conflict(s) locally git push origin INLONG-8684 -f ``` -- 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]
