From 1e91b914bf6aa68920ea22368d9c037970aa1f9d Mon Sep 17 00:00:00 2001
From: mconway <michael.c.conway@gmail.com>
Date: Thu, 06 Sep 2012 15:31:10 +0000
Subject:  [#922] User Profile Management cleanups upon first ll deployment

---
(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 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
 }
--
cgit