diff options
Diffstat (limited to 'lib/common/StreamableMemBlock.h')
| -rw-r--r-- | lib/common/StreamableMemBlock.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/lib/common/StreamableMemBlock.h b/lib/common/StreamableMemBlock.h index 3fcc62b3..6c1c5ab8 100644 --- a/lib/common/StreamableMemBlock.h +++ b/lib/common/StreamableMemBlock.h @@ -2,12 +2,8 @@ // // File // Name: StreamableMemBlock.h -<<<<<<< HEAD -// Purpose: Memory blocks which can be loaded and saved from streams -======= // Purpose: Memory blocks which can be loaded and saved from streams, // with a header indicating the size of the block. ->>>>>>> 0.12 // Created: 2003/09/05 // // -------------------------------------------------------------------------- |