Merge remote branch 'origin/release/2.0-rc1' into dev

cismet · Dec 4, 2012 · 9ae8e99 · 9ae8e99
2 parents 8d8e350 + 65bfcde
commit 9ae8e99
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>de.cismet.cids</groupId>
         <artifactId>cids-parent</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.0</version>
     </parent>
 
     <groupId>de.cismet.commons</groupId>

diff --git a/src/main/java/de/cismet/tools/Base64.java b/src/main/java/de/cismet/tools/Base64.java
@@ -7,8 +7,6 @@
 ****************************************************/
 package de.cismet.tools;
 
-import sun.misc.BASE64Encoder;
-
 /**
  * DOCUMENT ME!
  *