You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@groovy.apache.org by pa...@apache.org on 2019/05/15 09:08:51 UTC

[groovy] 11/27: Split history main/groovy/groovy/inspect/TextNode.groovy to main/groovy/groovy/console - resolve conflict and keep both files

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 d4dcc736d9287e0a20e1ee36750c12ea854f191a
Merge: 0bf1f46 e57644b
Author: Paul King <pa...@asert.com.au>
AuthorDate: Wed May 15 14:47:26 2019 +1000

    Split history main/groovy/groovy/inspect/TextNode.groovy to main/groovy/groovy/console - resolve conflict and keep both files

 .../src/main/groovy/groovy/console/TextNode.groovy | 54 ++++++++++++++++++++++
 .../console/{swingui => ui}/AstBrowser.groovy      |  0
 .../{swingui => ui}/AstNodeToScriptAdapter.groovy  |  0
 .../{swingui => ui}/ButtonOrDefaultRenderer.groovy |  0
 .../{swingui => ui}/ButtonOrTextEditor.groovy      |  0
 .../console/{swingui => ui}/ObjectBrowser.groovy   |  0
 .../{swingui => ui}/ScriptToTreeNodeAdapter.groovy |  0
 .../groovy/console/{ => ui}/swingui/package.html   |  0
 8 files changed, 54 insertions(+)