diff options
| author |  kenton@google.com <kenton@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2009-08-01 00:44:01 +0000 |
|---|---|---|
| committer | kenton@google.com <kenton@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2009-08-01 00:44:01 +0000 |
| commit | c3a24531d120f3dba671db18b1def90205549e6e (patch) | |
| tree | 3d97f9b114512b6e7ff6ed83da05b14bbe6d7601 /src/google/protobuf/io/gzip_stream.cc | |
| parent | 253a8508047a23e06d46a276480360f76b3cb219 (diff) | |
Hurr, some merge conflict was resolved poorly. Fixed.
Diffstat (limited to 'src/google/protobuf/io/gzip_stream.cc')
| -rw-r--r-- | src/google/protobuf/io/gzip_stream.cc | 2 |
1 files changed, 1 insertions, 1 deletions
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 |