groovy-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pa...@apache.org
Subject [groovy] 11/19: Split history main/resources/org/codehaus/groovy/antlib.xml to main/resources/groovy/ant - resolve conflict and keep both files
Date Wed, 15 May 2019 14:31:22 GMT
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 <paulk@asert.com.au>
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(+)


Mime
View raw message