From c3a24531d120f3dba671db18b1def90205549e6e Mon Sep 17 00:00:00 2001 From: "kenton@google.com" Date: Sat, 1 Aug 2009 00:44:01 +0000 Subject: Hurr, some merge conflict was resolved poorly. Fixed. --- src/google/protobuf/io/gzip_stream.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/google/protobuf/io/gzip_stream.cc b/src/google/protobuf/io/gzip_stream.cc index e1a35ea2..84d277f4 100644 --- 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 -- cgit v1.2.3