")
@@ -1195,14 +1441,13 @@ public class Desktop extends jalview.jbgui.GDesktop
// message.append("
...Checking latest version...");
} else if (!latestVersion.equals(Cache.getProperty("VERSION"))) {
boolean red = false;
- if (Cache.getProperty("VERSION").toLowerCase().indexOf("automated build") == -1) {
+ if (Cache.getProperty("VERSION").toLowerCase(Locale.ROOT).indexOf("automated build") == -1) {
red = true;
// Displayed when code version and jnlp version do not match and code
// version is not a development build
message.append("");
}
-<<<<<<< HEAD
message.append("
!! Version ").append(Cache.getDefault("LATEST_VERSION", "..Checking.."))
.append(" is available for download from ")
.append(Cache.getDefault("www.jalview.org", "https://www.jalview.org")).append(" !!");
@@ -1217,31 +1462,6 @@ public class Desktop extends jalview.jbgui.GDesktop
message.append("
");
return message.toString();
-=======
- message.append("
!! Version "
- + jalview.bin.Cache.getDefault("LATEST_VERSION",
- "..Checking..")
- + " is available for download from "
- + jalview.bin.Cache.getDefault("www.jalview.org",
- "https://www.jalview.org")
- + " !!");
- if (red)
- {
- message.append("