瀏覽代碼

冲突解决

huyuguo 4 年之前
父節點
當前提交
df6eeeb220
共有 1 個文件被更改,包括 0 次插入4 次删除
  1. 0 4
      app/src/main/java/com/electric/chargingpile/activity/PublishPicTopicActivity.java

+ 0 - 4
app/src/main/java/com/electric/chargingpile/activity/PublishPicTopicActivity.java

@ -535,11 +535,7 @@ public class PublishPicTopicActivity extends Activity implements OnClickListener
535 535
                try {
536 536
                    List<Uri> uriList = Matisse.obtainResult(data);
537 537
                    int i = 0;
538
<<<<<<< HEAD
539 538
                    for (Uri uri : uriList) {
540
=======
541
                    for (Uri uri: uriList) {
542
>>>>>>> 6efbc9d6e98858790040bd79841a2e24ccf64848
543 539
                        i++;
544 540
                        Bitmap bitmap = BitmapFactory.decodeStream(getContentResolver().openInputStream(uri));
545 541
                        File file = FileUtils.from(PublishPicTopicActivity.this, uri);