Fix merge mishap

jean-philippe-martin · jean-philippe-martin · commit ab18107395f5 · 2016-03-10T10:32:13.000-08:00
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobInfo.java b/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;
     }
