Resolved merge conflicts Conflicts: private/java/test/org/broadinstitute/sting/gatk/walkers/na12878kb/core/MongoVariantContextUnitTest.java private/java/test/org/broadinstitute/sting/gatk/walkers/na12878kb/core/NA12878KBUnitTestBase.java |
||
|---|---|---|
| licensing | ||
| protected/java | ||
| public | ||
| settings | ||
| .gitignore | ||
| build.xml | ||
| intellij_example.tar.bz2 | ||
| ivy.xml | ||