From: kiramt <k.mourao@dundee.ac.uk>
Date: Fri, 24 Mar 2017 09:44:01 +0000 (+0000)
Subject: Merge remote-tracking branch 'origin/develop' into bug/JAL-2314
X-Git-Tag: Release_2_10_2~3^2~141
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=8f9537bd5d7f4455c6309569e2ca260463b7d2e4;hp=c355d0f7a994d0d064078d363e612eb8c89581f1;p=jalview.git

Merge remote-tracking branch 'origin/develop' into bug/JAL-2314
---

diff --git a/test/jalview/gui/AlignmentPanelTest.java b/test/jalview/gui/AlignmentPanelTest.java
index c580a88..b228ba1 100644
--- a/test/jalview/gui/AlignmentPanelTest.java
+++ b/test/jalview/gui/AlignmentPanelTest.java
@@ -166,6 +166,7 @@ public class AlignmentPanelTest
   public void TestSetScrollValues()
   {
     ViewportRanges ranges = af.getViewport().getRanges();
+    af.alignPanel.setScrollValues(0, 0);
 
     int oldres = ranges.getEndRes();
     af.alignPanel.setScrollValues(-1, 5);