change version

Author: yangsen

library/src/main/java/com/qiniu/android/common/Constants.java

@@ -2,11 +2,8 @@
 
 
 public final class Constants {
-<<<<<<< HEAD
+
     public static final String VERSION = "8.4.2";
-=======
-    public static final String VERSION = "8.3.4";
->>>>>>> 8.3.4
 
     public static final String UTF_8 = "utf-8";
 }