Resolve properties file merge conflict with develop
[jalview.git] / src / jalview / urls / desktop / DesktopUrlProviderFactory.java
2016-12-12 kiramtJAL-2316 Added jalview.urls.* packages