summaryrefslogtreecommitdiffstats
path: root/idrop-lite
diff options
context:
space:
mode:
authormconway <michael.c.conway@gmail.com>2012-09-06 15:31:10 (GMT)
committer mconway <michael.c.conway@gmail.com>2012-09-06 15:31:10 (GMT)
commit1e91b914bf6aa68920ea22368d9c037970aa1f9d (patch)
tree0f4a40100334acec64504c7ca158d5e54530cf63 /idrop-lite
parent845e80d304fc0abcb67c5618989e241e59341284 (diff)
downloadQCG-Data-1e91b914bf6aa68920ea22368d9c037970aa1f9d.zip
QCG-Data-1e91b914bf6aa68920ea22368d9c037970aa1f9d.tar.gz
QCG-Data-1e91b914bf6aa68920ea22368d9c037970aa1f9d.tar.bz2
[#922] User Profile Management cleanups upon first ll deployment
Diffstat (limited to 'idrop-lite')
-rw-r--r--idrop-lite/src/main/java/org/irods/jargon/idrop/lite/Version.java4
1 files changed, 0 insertions, 4 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 d118c07..fd167a8 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,8 +1,4 @@
package org.irods.jargon.idrop.lite;
public final class Version {
-<<<<<<< HEAD
- public static String VERSION="20120828-1415";
-=======
public static String VERSION="20120828-1442";
->>>>>>> development
}