JAL-3066 remove git conflict file
[jalview.git] / examples / biojson-doc / .gitignore
1 .idea
2 docson.iml
3 /nbproject