diff options
author | Lisa Stillwell <lisa@renci.org> | 2012-10-24 15:37:05 (GMT) |
---|---|---|
committer | Lisa Stillwell <lisa@renci.org> | 2012-10-24 15:37:05 (GMT) |
commit | 3dc11f3d486468834845fa2a615d4dfec3543c0f (patch) | |
tree | 243527268da653de592e4cad9565ad0299ea3c4d /idrop-lite | |
parent | 6d46c90aaa8408f7b9115ad24a4703dcb51ba673 (diff) | |
download | QCG-Data-3dc11f3d486468834845fa2a615d4dfec3543c0f.zip QCG-Data-3dc11f3d486468834845fa2a615d4dfec3543c0f.tar.gz QCG-Data-3dc11f3d486468834845fa2a615d4dfec3543c0f.tar.bz2 |
[#983] fix up files that needed merging due to stash on branch change
Diffstat (limited to 'idrop-lite')
-rw-r--r-- | idrop-lite/src/main/java/org/irods/jargon/idrop/lite/Version.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/idrop-lite/src/main/java/org/irods/jargon/idrop/lite/Version.java b/idrop-lite/src/main/java/org/irods/jargon/idrop/lite/Version.java index eb1a04e..a1c6c10 100644 --- a/idrop-lite/src/main/java/org/irods/jargon/idrop/lite/Version.java +++ b/idrop-lite/src/main/java/org/irods/jargon/idrop/lite/Version.java @@ -1,5 +1,5 @@ package org.irods.jargon.idrop.lite; public final class Version { public static String VERSION="1.0.2-SNAPSHOT"; - public static String BUILD_TIME="20121012-1550"; + public static String BUILD_TIME="20121024-1006"; } |