diff options
Diffstat (limited to 'lib/common/ZeroStream.cpp')
| -rw-r--r-- | lib/common/ZeroStream.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/lib/common/ZeroStream.cpp b/lib/common/ZeroStream.cpp index 26fd62cb..d11ed80c 100644 --- a/lib/common/ZeroStream.cpp +++ b/lib/common/ZeroStream.cpp @@ -152,11 +152,7 @@ void ZeroStream::Close() // -------------------------------------------------------------------------- bool ZeroStream::StreamDataLeft() { -<<<<<<< HEAD - return false; -======= return (BytesLeftToRead() > 0); ->>>>>>> 0.12 } // -------------------------------------------------------------------------- |