Latest bnd sync

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1370165 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/bundleplugin/src/main/java/aQute/lib/json/ByteArrayHandler.java b/bundleplugin/src/main/java/aQute/lib/json/ByteArrayHandler.java
index 957369f..a336e97 100644
--- a/bundleplugin/src/main/java/aQute/lib/json/ByteArrayHandler.java
+++ b/bundleplugin/src/main/java/aQute/lib/json/ByteArrayHandler.java
@@ -33,7 +33,6 @@
 	Object decode(Decoder dec, String s) throws Exception {
 		if ( dec.codec.isHex())
 			return Hex.toByteArray(s);
-		else
-			return Base64.decodeBase64(s);
+		return Base64.decodeBase64(s);
 	}
 }