This is an automated email from the ASF dual-hosted git repository. paulk pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/groovy.git
commit bb9dc015546a7a2f78db4b335e76af7b8ed09b47 Merge: 89289c4 55c3b22 Author: Paul King <[email protected]> AuthorDate: Thu May 16 18:28:39 2019 +1000 Split history main/java/groovy/util/XmlSlurper.java to main/java/groovy/xml - resolve conflict and keep both files .../src/main/java/groovy/xml/XmlSlurper.java | 465 +++++++++++++++++++++ 1 file changed, 465 insertions(+)
