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 e8d7f94740c0cc207b188348c9d7d6345d758301
Merge: 45df810 3b0199f
Author: Paul King <[email protected]>
AuthorDate: Wed May 15 20:12:34 2019 +1000

    Split history main/resources/org/codehaus/groovy/antlib.xml to 
main/resources/groovy/ant - resolve conflict and keep both files

 .../src/main/resources/groovy/ant/antlib.xml       | 32 ++++++++++++++++++++++
 1 file changed, 32 insertions(+)

Reply via email to