Hurr, some merge conflict was resolved poorly. Fixed.

This commit is contained in:
kenton@google.com 2009-08-01 00:44:01 +00:00
parent 253a850804
commit c3a24531d1

View File

@ -315,6 +315,6 @@ bool GzipOutputStream::Close() {
} // namespace io
} // namespace protobuf
} // namespace google
#endif // HAVE_ZLIB
} // namespace google