merge conflict

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

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