git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Resolved merge conflict in EdtiCommandTest.java
[jalview.git]
/
test
/
jalview
/
commands
/
EditCommandTest.java
diff --git
a/test/jalview/commands/EditCommandTest.java
b/test/jalview/commands/EditCommandTest.java
index
375ae55
..
6fa7c22
100644
(file)
--- a/
test/jalview/commands/EditCommandTest.java
+++ b/
test/jalview/commands/EditCommandTest.java
@@
-31,7
+31,7
@@
public class EditCommandTest
private Alignment al;
@BeforeMethod(alwaysRun = true)
- public void setUp()
+ public void setUp()
{
testee = new EditCommand();
seqs = new SequenceI[4];