Merging both branches together
Project: http://git-wip-us.apache.org/repos/asf/incubator-netbeans-html4j/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-netbeans-html4j/commit/f6e7bc79 Tree: http://git-wip-us.apache.org/repos/asf/incubator-netbeans-html4j/tree/f6e7bc79 Diff: http://git-wip-us.apache.org/repos/asf/incubator-netbeans-html4j/diff/f6e7bc79 Branch: refs/heads/master Commit: f6e7bc79554bb051a65ef1c69ce594b1908c5c79 Parents: 64b319a eed653a Author: Jaroslav Tulach <[email protected]> Authored: Tue Oct 10 18:50:49 2017 +0200 Committer: Jaroslav Tulach <[email protected]> Committed: Tue Oct 10 18:50:49 2017 +0200 ---------------------------------------------------------------------- .../java/org/netbeans/html/json/impl/JSON.java | 52 ++++++++++++++++++-- pom.xml | 39 --------------- 2 files changed, 49 insertions(+), 42 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-netbeans-html4j/blob/f6e7bc79/pom.xml ----------------------------------------------------------------------
