merge with remoteio branch

[bamtools.git] / src / api / internal / bam / BamReader_p.cpp

diff --git a/src/api/internal/bam/BamReader_p.cpp b/src/api/internal/bam/BamReader_p.cpp
index 6484a10b2c0f07aed19e31a74b1d5f9ed114c51a..6904da7a6f3f53c917ba6d274521c2aaf6d7208c 100644 (file)
--- a/src/api/internal/bam/BamReader_p.cpp
+++ b/src/api/internal/bam/BamReader_p.cpp
@@ -2,7 +2,11 @@
 // BamReader_p.cpp (c) 2009 Derek Barnett
 // Marth Lab, Department of Biology, Boston College
 // ---------------------------------------------------------------------------
+<<<<<<< HEAD:src/api/internal/BamReader_p.cpp
+// Last modified: 14 November 2011 (DB)
+=======
 // Last modified: 25 October 2011 (DB)
+>>>>>>> remoteio:src/api/internal/bam/BamReader_p.cpp
 // ---------------------------------------------------------------------------
 // Provides the basic functionality for reading BAM files
 // ***************************************************************************
@@ -367,7 +371,6 @@ bool BamReaderPrivate::Open(const string& filename) {
 
         // open BgzfStream
         m_stream.Open(filename, IBamIODevice::ReadOnly);
-        assert(m_stream);
 
         // load BAM metadata
         LoadHeaderData();