Fix conflicts 2
Project: http://git-wip-us.apache.org/repos/asf/incubator-juneau/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-juneau/commit/5b8990ed Tree: http://git-wip-us.apache.org/repos/asf/incubator-juneau/tree/5b8990ed Diff: http://git-wip-us.apache.org/repos/asf/incubator-juneau/diff/5b8990ed Branch: refs/heads/master Commit: 5b8990ed5013656fd67a687d70505f67f982cc16 Parents: c04b161 e7ab5a4 Author: jamesbognar <[email protected]> Authored: Sun Aug 28 12:23:49 2016 -0400 Committer: jamesbognar <[email protected]> Committed: Sun Aug 28 12:23:49 2016 -0400 ---------------------------------------------------------------------- ----------------------------------------------------------------------
