diff options
| author | Emiel Bruijntjes <emiel.bruijntjes@copernica.com> | 2014-08-26 13:08:39 +0200 |
|---|---|---|
| committer | Emiel Bruijntjes <emiel.bruijntjes@copernica.com> | 2014-08-26 13:08:39 +0200 |
| commit | f526c4c7a7ada1ab534ca0976c7b66718b9a5660 (patch) | |
| tree | 68b4db309ee00d3b7ebc1743b4825057b3db7f28 /zend/streambuf.cpp | |
| parent | a286c34777e48d59410e7511f52f4a6f08000ba3 (diff) | |
| parent | 97bc6757346d394a4b7d5898983be298e0b0ea98 (diff) | |
fixed conflict
Diffstat (limited to 'zend/streambuf.cpp')
| -rw-r--r-- | zend/streambuf.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/zend/streambuf.cpp b/zend/streambuf.cpp index 86e5f03..11d928d 100644 --- a/zend/streambuf.cpp +++ b/zend/streambuf.cpp @@ -33,7 +33,6 @@ int StreamBuf::sync() // not null terminated and (2) it could contain % signs and allow all // sorts of buffer overflows. zend_error(_error, "%.*s", (int)size, pbase()); - } else { @@ -52,4 +51,4 @@ int StreamBuf::sync() * End namespace */ } -
\ No newline at end of file + |