Mauricio Carneiro 3837aa45b4 Fixing conflicts ... Conflicts: public/java/test/org/broadinstitute/sting/utils/clipreads/ReadClipperUnitTest.java		2011-10-03 19:07:59 -07:00
..
ReadClipperUnitTest.java	Fixing conflicts	2011-10-03 19:07:59 -07:00