[groovy] 19/25: Split history main/java/groovy/util/XmlParser.java to main/java/groovy/xml - resolve conflict and keep both files

[paulk]

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 d6258d6fabb60d02aae81600090bc0c469426122
Merge: 344fd25 c3632b8
Author: Paul King <pa...@asert.com.au>
AuthorDate: Thu May 16 18:28:57 2019 +1000

    Split history main/java/groovy/util/XmlParser.java to main/java/groovy/xml 
- resolve conflict and keep both files

 .../src/main/java/groovy/xml/XmlParser.java        | 502 +++++++++++++++++++++
 1 file changed, 502 insertions(+)