From: kiramt <k.mourao@dundee.ac.uk>
Date: Thu, 23 Mar 2017 20:40:10 +0000 (+0000)
Subject: Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
X-Git-Tag: Release_2_10_2~3^2~141^2
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=e48d34b3938b4ac05a3dcaf3ab29e6317080f229;hp=844c332f108aba635608f13dedf2b08777b3a477;p=jalview.git

Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
---

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);