This is an automated email from the ASF dual-hosted git repository. rgoers pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/flume.git
commit eb5936b9a4a12f7b704cb34633eb890890909c34 Merge: a98f292 4a6cfdc Author: Ralph Goers <[email protected]> AuthorDate: Sat Mar 26 14:51:38 2022 -0700 Fix conflict again pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
