Hurr, some merge conflict was resolved poorly. Fixed.

16 years ago · c3a24531d1
parent 253a850804
commit c3a24531d1
1 changed files with 1 additions and 1 deletions
--- a/src/google/protobuf/io/gzip_stream.cc
+++ b/src/google/protobuf/io/gzip_stream.cc
@ -315,6 +315,6 @@ bool GzipOutputStream::Close() {

 }  // namespace io
 }  // namespace protobuf
+}  // namespace google

 #endif  // HAVE_ZLIB
-}  // namespace google