From: Jim Procter <j.procter@dundee.ac.uk>
Date: Thu, 27 Jan 2022 14:21:39 +0000 (+0000)
Subject: Merge branch 'bug/JAL-3633_read_proxy_settings_from_jalview_properties_in_getdown... 
X-Git-Tag: Release_2_11_2_0~13^2~8
X-Git-Url: http://source.jalview.org/gitweb/?p=jalview.git;a=commitdiff_plain;h=b26fefd329b60deb2025aa28cdbaae30bfb58382

Merge branch 'bug/JAL-3633_read_proxy_settings_from_jalview_properties_in_getdown' into develop

 Conflicts:
	src/jalview/bin/MemorySetting.java
---

b26fefd329b60deb2025aa28cdbaae30bfb58382
diff --cc src/jalview/bin/MemorySetting.java
index 52f0c9e,cf5725c..56713b0
--- a/src/jalview/bin/MemorySetting.java
+++ b/src/jalview/bin/MemorySetting.java
@@@ -31,8 -33,7 +33,6 @@@ package jalview.bin
   * @author bsoares
   *
   */
- import java.util.Locale;
--
  public class MemorySetting
  {
    public static final String MAX_HEAPSIZE_PERCENT_PROPERTY_NAME = "jvmmempc";