diff options
Diffstat (limited to 'lib/common/MemBlockStream.cpp')
| -rw-r--r-- | lib/common/MemBlockStream.cpp | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/lib/common/MemBlockStream.cpp b/lib/common/MemBlockStream.cpp index 554fc6ae..3a43a304 100644 --- a/lib/common/MemBlockStream.cpp +++ b/lib/common/MemBlockStream.cpp @@ -22,8 +22,6 @@ // // Function // Name: MemBlockStream::MemBlockStream() -<<<<<<< HEAD -======= // Purpose: Constructor with no contents // Created: 2012/11/07 // @@ -38,7 +36,6 @@ MemBlockStream::MemBlockStream() // // Function // Name: MemBlockStream::MemBlockStream() ->>>>>>> 0.12 // Purpose: Constructor (doesn't copy block, careful with lifetimes) // Created: 2003/09/05 // @@ -86,10 +83,6 @@ MemBlockStream::MemBlockStream(const CollectInBufferStream &rBuffer) ASSERT(mBytesInBuffer >= 0); } -<<<<<<< HEAD - -======= ->>>>>>> 0.12 // -------------------------------------------------------------------------- // // Function |