Commits

Anonymous committed d6bece6

Hurr, some merge conflict was resolved poorly. Fixed.

Comments (0)

Files changed (1)

src/google/protobuf/io/gzip_stream.cc

 
 }  // namespace io
 }  // namespace protobuf
+}  // namespace google
 
 #endif  // HAVE_ZLIB
-}  // namespace google