1. Andrew Godwin
  2. protobuf

Commits

ken...@google.com@630680e5-0e50-0410-840e-4b1c322b438d  committed d6bece6

Hurr, some merge conflict was resolved poorly. Fixed.

  • Participants
  • Parent commits 4d238f1
  • Branches default

Comments (0)

Files changed (1)

File src/google/protobuf/io/gzip_stream.cc

View file
 
 }  // namespace io
 }  // namespace protobuf
+}  // namespace google
 
 #endif  // HAVE_ZLIB
-}  // namespace google