Resolved merge conflict Conflicts: public/java/test/org/broadinstitute/sting/BaseTest.java |
||
|---|---|---|
| licensing | ||
| protected/java/src/org/broadinstitute/sting | ||
| public | ||
| settings | ||
| .gitignore | ||
| build.xml | ||
| ivy.xml | ||
Resolved merge conflict Conflicts: public/java/test/org/broadinstitute/sting/BaseTest.java |
||
|---|---|---|
| licensing | ||
| protected/java/src/org/broadinstitute/sting | ||
| public | ||
| settings | ||
| .gitignore | ||
| build.xml | ||
| ivy.xml | ||