From: tcofoegbu <tcnofoegbu@dundee.ac.uk>
Date: Thu, 23 Jul 2015 11:44:08 +0000 (+0100)
Subject: Resolved merge conflict in EdtiCommandTest.java
X-Git-Tag: Release_2_10_0~563^2
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=6897b5d861a256c94b23167254c3f4e2ab6acb3a;p=jalview.git

Resolved merge conflict in EdtiCommandTest.java
---

6897b5d861a256c94b23167254c3f4e2ab6acb3a
diff --cc test/jalview/commands/EditCommandTest.java
index 375ae55,ee2a581..6fa7c22
--- a/test/jalview/commands/EditCommandTest.java
+++ b/test/jalview/commands/EditCommandTest.java
@@@ -30,8 -30,9 +30,8 @@@ public class EditCommandTes
  
    private Alignment al;
  
 -  @BeforeMethod(groups =
 -  { "Functional" })
 -  public void setUp()
 + @BeforeMethod(alwaysRun = true)
-   public void setUp()
++   public void setUp()
    {
      testee = new EditCommand();
      seqs = new SequenceI[4];