Hurr, some merge conflict was resolved poorly. Fixed.

c3a24531 · kenton@google.com · 253a8508 · c3a24531
Commit c3a24531 authored Aug 01, 2009 by kenton@google.com
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

gzip_stream.cc src/google/protobuf/io/gzip_stream.cc +1 -1

No files found.
--- 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