Post-merge cleanup

[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 6904da7a6f3f53c917ba6d274521c2aaf6d7208c..75d727928bb6757c49f033ea938e2fa4e81a5f20 100644 (file)
--- a/src/api/internal/bam/BamReader_p.cpp
+++ b/src/api/internal/bam/BamReader_p.cpp
@@ -2,11 +2,7 @@
 // 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
+// Last modified: 28 November 2011 (DB)
 // ---------------------------------------------------------------------------
 // Provides the basic functionality for reading BAM files
 // ***************************************************************************