1 files changed, 6 insertions, 0 deletions
diff --git a/lib/common/MemBlockStream.h b/lib/common/MemBlockStream.h
index 5234525b..ed0bf4ff 100644
--- a/lib/common/MemBlockStream.h
+++ b/lib/common/MemBlockStream.h
@@ -27,7 +27,10 @@ class CollectInBufferStream;
 class MemBlockStream : public IOStream
 {
 public:
+<<<<<<< HEAD
+=======
 	MemBlockStream();
+>>>>>>> 0.12
 	MemBlockStream(const void *pBuffer, int Size);
 	MemBlockStream(const StreamableMemBlock &rBlock);
 	MemBlockStream(const CollectInBufferStream &rBuffer);
@@ -42,8 +45,11 @@ public:
 	virtual void Seek(pos_type Offset, int SeekType);
 	virtual bool StreamDataLeft();
 	virtual bool StreamClosed();
+<<<<<<< HEAD
+=======
 	virtual const void* GetBuffer() const { return mpBuffer; }
 	virtual int GetSize() const { return mBytesInBuffer; }
+>>>>>>> 0.12
 
 private:
 	const char *mpBuffer;