Merge commit 'refs/pull/46/head' of https://github.com/apache/freemarker into 2.3-gae
Project: http://git-wip-us.apache.org/repos/asf/freemarker/repo Commit: http://git-wip-us.apache.org/repos/asf/freemarker/commit/a03a1473 Tree: http://git-wip-us.apache.org/repos/asf/freemarker/tree/a03a1473 Diff: http://git-wip-us.apache.org/repos/asf/freemarker/diff/a03a1473 Branch: refs/heads/2.3-gae Commit: a03a1473b65d9819674b285a0538fed824f37478 Parents: 43d0658 b2ff815 Author: ddekany <ddek...@apache.org> Authored: Sun Jun 10 18:48:28 2018 +0200 Committer: ddekany <ddek...@apache.org> Committed: Sun Jun 10 18:48:28 2018 +0200 ---------------------------------------------------------------------- .../java/freemarker/core/UnexpectedTypeException.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) ----------------------------------------------------------------------
