summaryrefslogtreecommitdiffstats
path: root/idrop-lite
diff options
context:
space:
mode:
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
}