merge conflict

[bamtools.git] / src / api / SamSequenceDictionary.cpp

diff --git a/src/api/SamSequenceDictionary.cpp b/src/api/SamSequenceDictionary.cpp
index 0c9258137e83b31023dd2a68e9a21043cb23dda5..34cf3284dbbca650e3597de8eb41c2d3f853090c 100644 (file)
--- a/src/api/SamSequenceDictionary.cpp
+++ b/src/api/SamSequenceDictionary.cpp
@@ -1,7 +1,6 @@
 // ***************************************************************************
 // SamSequenceDictionary.cpp (c) 2010 Derek Barnett
 // Marth Lab, Department of Biology, Boston College
-// All rights reserved.
 // ---------------------------------------------------------------------------
 // Last modified: 1 October 2011 (DB)
 // ---------------------------------------------------------------------------