Projects >> java-sdk >>b226fec4b240aca7b4d68310c5dfcbdc1cc35598

Chunk
Conflicting content 
	/**本地检测不通过、程序抛异常，设置 CallRet 的 statusCode 为此错误码*/
	public static final int ERROR_CODE = 0;

<<<<<<< HEAD
	public static final String VERSION = "6.1.7";

	/**
	 * You can get your accesskey from  https://portal.qiniu.com/setting/key 
	 */
	public static String ACCESS_KEY = "";

	/**
	 * You can get your accesskey from  https://portal.qiniu.com/setting/key 
	 */
	public static String SECRET_KEY = "";
=======
	public static final String VERSION = "6.1.9";

	public static String ACCESS_KEY = "";

	public static String SECRET_KEY = "";
>>>>>>> 74b718f37c8aefcc8c33f4e19427bb25f4f0d41c

	public static String RS_HOST = "http://rs.qbox.me";
Solution content 
	/**本地检测不通过、程序抛异常，设置 CallRet 的 statusCode 为此错误码*/
	public static final int ERROR_CODE = 0;

	public static final String VERSION = "6.1.9";

	public static String ACCESS_KEY = "";

	public static String SECRET_KEY = "";

	public static String RS_HOST = "http://rs.qbox.me";
File
Config.java
Developer's decision
Version 2
Kind of conflict
Attribute
Comment