JAL-3066 remove git conflict file
[jalview.git] / settings.gradle
2019-10-22 Ben SoaresJAL-3210 project name explicitly set. updated README_GR...