package com.qiniu.android.common;


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";
}

@@ -64,20 +64,8 @@
 s %7B%0A
-%3C%3C%3C%3C%3C%3C%3C HEAD
 %0A   
@@ -114,80 +114,8 @@
 .2%22;
-%0A=======%0A    public static final String VERSION = %228.3.4%22;%0A%3E%3E%3E%3E%3E%3E%3E 8.3.4
 %0A%0A  

change version