merge conflict

[bamtools.git] / src / toolkit / bamtools_count.cpp

diff --git a/src/toolkit/bamtools_count.cpp b/src/toolkit/bamtools_count.cpp
index d438eab9595502e6051e71d70cca5c84404662bd..7244f241361cbba1603f3f1d93b0b1732dc1e9d4 100644 (file)
--- a/src/toolkit/bamtools_count.cpp
+++ b/src/toolkit/bamtools_count.cpp
@@ -1,7 +1,6 @@
 // ***************************************************************************
 // bamtools_count.cpp (c) 2010 Derek Barnett, Erik Garrison
 // Marth Lab, Department of Biology, Boston College
-// All rights reserved.
 // ---------------------------------------------------------------------------
 // Last modified: 7 April 2011
 // ---------------------------------------------------------------------------