Update upload_pfops.java

jemygraw · web-flow · commit 1ca6ec3fb0dc · 2018-01-29T17:18:03.000+08:00
diff --git a/examples/upload_pfops.java b/examples/upload_pfops.java
@@ -6,17 +6,12 @@
 import com.qiniu.util.UrlSafeBase64;
 
 import java.io.IOException;
-
-<<<<<<<HEAD
 import com.qiniu.common.QiniuException;
 import com.qiniu.http.Response;
 import com.qiniu.storage.UploadManager;
 import com.qiniu.storage.Configuration;
 import com.qiniu.common.Zone;
 
-=======
-        >>>>>>>java/master
-
 public class UploadDemo {
     //设置好账号的ACCESS_KEY和SECRET_KEY
     String ACCESS_KEY = "Access_Key";
