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 740a701cbab354d4c99f6123df7278b6b74c2c42 Merge: 36f5e0c 9025fa3 Author: Paul King <[email protected]> AuthorDate: Wed May 15 17:34:07 2019 +1000 Split history main/resources/groovy/inspect/swingui/AstBrowserProperties.groovy to main/resources/groovy/console/ui - resolve conflict and keep both files .../groovy/console/ui/AstBrowserProperties.groovy | 67 ++++++++++++++++++++++ 1 file changed, 67 insertions(+)
