diff options
| author | mconway <michael.c.conway@gmail.com> | 2012-09-05 15:47:37 (GMT) |
|---|---|---|
| committer | mconway <michael.c.conway@gmail.com> | 2012-09-05 15:47:37 (GMT) |
| commit | 19013250e80447f60d611bf6a82ad2c31aeaa8a3 (patch) | |
| tree | 1b6ce4bae4e00480756645eeab40ee5aa45ee964 /idrop-lite | |
| parent | 9774b088f51981e1468de9b6a8a2cabe7f6fe0a8 (diff) | |
| parent | 73e20a18274819bc98e5fe88452621cf67abac8e (diff) | |
| download | QCG-Data-19013250e80447f60d611bf6a82ad2c31aeaa8a3.zip QCG-Data-19013250e80447f60d611bf6a82ad2c31aeaa8a3.tar.gz QCG-Data-19013250e80447f60d611bf6a82ad2c31aeaa8a3.tar.bz2 | |
[#950] merge user profile and deploy to ll
Diffstat (limited to 'idrop-lite')
| -rw-r--r-- | idrop-lite/src/main/java/org/irods/jargon/idrop/lite/Version.java | 4 |
1 files changed, 4 insertions, 0 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 8fd48d3..d118c07 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,4 +1,8 @@ package org.irods.jargon.idrop.lite; public final class Version { +<<<<<<< HEAD public static String VERSION="20120828-1415"; +======= + public static String VERSION="20120828-1442"; +>>>>>>> development } |