JAL-3066 remove git conflict file
[jalview.git] / test / jalview / fts / threedbeacons / .gitignore
1 /tdbJson.java
2 /tdbresttest2.java