From 3dc11f3d486468834845fa2a615d4dfec3543c0f Mon Sep 17 00:00:00 2001 From: Lisa Stillwell Date: Wed, 24 Oct 2012 15:37:05 +0000 Subject: [#983] fix up files that needed merging due to stash on branch change --- (limited to 'idrop-lite') 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"; } -- cgit