fixed the merge
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/c072a396 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/c072a396 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/c072a396 Branch: refs/heads/master Commit: c072a3965fcaa7d465377af2938b8073e919eb99 Parents: 3e08f21 867778b Author: raminder <[email protected]> Authored: Wed May 28 15:12:21 2014 -0400 Committer: raminder <[email protected]> Committed: Wed May 28 15:12:21 2014 -0400 ---------------------------------------------------------------------- .../java/org/apache/airavata/client/tools/DocumentCreator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/c072a396/modules/airavata-client/src/main/java/org/apache/airavata/client/tools/DocumentCreator.java ----------------------------------------------------------------------
