merge conflict

[bamtools.git] / src / api / internal / BamMultiMerger_p.h

diff --git a/src/api/internal/BamMultiMerger_p.h b/src/api/internal/BamMultiMerger_p.h
index bd596efc44634c7185726e4eee77b5f701a8cdf5..9248df0eb39a6dca3d2ca99e8b08e5f6b7315259 100644 (file)
--- a/src/api/internal/BamMultiMerger_p.h
+++ b/src/api/internal/BamMultiMerger_p.h
@@ -1,8 +1,8 @@
 // ***************************************************************************
 // BamMultiMerger_p.h (c) 2010 Derek Barnett
 // Marth Lab, Department of Biology, Boston College
-// All rights reserved.
 // ---------------------------------------------------------------------------
+// Last modified: 3 October 2011 (DB)
 // ---------------------------------------------------------------------------
 // Provides merging functionality for BamMultiReader.  At this point, supports
 // sorting results by (refId, position) or by read name.