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

Posted to commits@joshua.apache.org by mj...@apache.org on 2016/06/01 02:51:49 UTC

[54/94] [abbrv] incubator-joshua git commit: Resolve Merge Conflicts

Resolve Merge Conflicts


Project: http://git-wip-us.apache.org/repos/asf/incubator-joshua/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-joshua/commit/02f3ef16
Tree: http://git-wip-us.apache.org/repos/asf/incubator-joshua/tree/02f3ef16
Diff: http://git-wip-us.apache.org/repos/asf/incubator-joshua/diff/02f3ef16

Branch: refs/heads/master
Commit: 02f3ef162c518ba5768903fc5da9b25e1cd411ea
Parents: ef91969 d51b15c
Author: Thamme Gowda <tg...@gmail.com>
Authored: Wed May 25 22:00:09 2016 -0700
Committer: Thamme Gowda <tg...@gmail.com>
Committed: Wed May 25 22:00:09 2016 -0700

----------------------------------------------------------------------
 pom.xml | 13 +++++++++++++
 1 file changed, 13 insertions(+)
----------------------------------------------------------------------