Hurr, some merge conflict was resolved poorly. Fixed.
This commit is contained in:
parent
253a850804
commit
c3a24531d1
1 changed files with 1 additions and 1 deletions
|
@ -315,6 +315,6 @@ bool GzipOutputStream::Close() {
|
|||
|
||||
} // namespace io
|
||||
} // namespace protobuf
|
||||
} // namespace google
|
||||
|
||||
#endif // HAVE_ZLIB
|
||||
} // namespace google
|
||||
|
|
Loading…
Add table
Reference in a new issue