Mauricio Carneiro 3837aa45b4 Fixing conflicts ... Conflicts: public/java/test/org/broadinstitute/sting/utils/clipreads/ReadClipperUnitTest.java		2011-10-03 19:07:59 -07:00
..
config	Reorganized the codebase beneath top-level public and private directories,	2011-06-28 06:55:19 -04:00
src	Fixing conflicts	2011-10-03 19:07:59 -07:00
test	Fixing conflicts	2011-10-03 19:07:59 -07:00