From: Ben Soares <b.soares@dundee.ac.uk>
Date: Mon, 4 Oct 2021 16:46:03 +0000 (+0100)
Subject: Merge branch 'develop' into JAL-3416_different_look_and_feel_on_linux
X-Git-Tag: Release_2_11_2_6~44^2~14
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=5571d7868cad5493b52c9fc421c88c025e7c2d35;hp=--cc;p=jalview.git

Merge branch 'develop' into JAL-3416_different_look_and_feel_on_linux
---

5571d7868cad5493b52c9fc421c88c025e7c2d35
diff --cc src/jalview/bin/Jalview.java
index a1a6846,fe48283..73227d3
--- a/src/jalview/bin/Jalview.java
+++ b/src/jalview/bin/Jalview.java
@@@ -38,6 -39,6 +38,7 @@@ import java.security.PermissionCollecti
  import java.security.Permissions;
  import java.security.Policy;
  import java.util.HashMap;
++import java.util.Locale;
  import java.util.Map;
  import java.util.Vector;
  import java.util.logging.ConsoleHandler;