---

jean-philippe-martin · jean-philippe-martin · commit d58e8a88ade4 · 2016-03-10T10:32:13.000-08:00
yaml --- r: 3015 b: refs/heads/gcs-nio c: ab18107 h: refs/heads/master i: 3013: 9ba806a 3011: 58fab74 3007: 2670b3c
diff --git a/[refs] b/[refs]
@@ -13,4 +13,4 @@ refs/tags/v0.0.12: 2fd8066e891fb3dfea69b65f6bf6461db79342b9
 refs/heads/compute-alpha: b1274b5bdf4eea955f3588b56378a5ae4ba59cef
 refs/heads/dns-alpha: 2f90e7e338349287ace33375896907af0f032ca1
 refs/heads/dns-alpha-batch: 17442b07867021b85d0452f5f3eda29a3413288f
-refs/heads/gcs-nio: 745e1f3a82c7c2e9647773b53eeb54c8de788567
+refs/heads/gcs-nio: ab18107395f5a8b8ca6b18a8fa40b3f48516abf6
diff --git a/branches/gcs-nio/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobInfo.java b/branches/gcs-nio/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobInfo.java
@@ -308,15 +308,8 @@ Builder owner(Acl.Entity owner) {
       return this;
     }
 
-<<<<<<< HEAD
-    /**
-     * Sets the blob's size in bytes.
-     */
-    public Builder size(Long size) {
-=======
     @Override
     Builder size(Long size) {
->>>>>>> master
       this.size = size;
       return this;
     }
