git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 2: 32973e4)
Merge branch 'features/JAL-1264_showHideAnnotations' into forpush/JAL-674_dssp
authorJim Procter <j.procter@dundee.ac.uk>
Tue, 21 Oct 2014 10:10:52 +0000 (11:10 +0100)
committerJim Procter <j.procter@dundee.ac.uk>
Tue, 21 Oct 2014 10:10:52 +0000 (11:10 +0100)
EOL changes conflict with new lines from mungo's branch
Conflicts:
resources/lang/Messages.properties
src/jalview/datamodel/SequenceI.java

src/jalview/datamodel/SequenceI.java patch | blob | history

diff --git a/src/jalview/datamodel/SequenceI.java b/src/jalview/datamodel/SequenceI.java
index 876db03..2e68371 100755 (executable)
--- a/src/jalview/datamodel/SequenceI.java
+++ b/src/jalview/datamodel/SequenceI.java
@@ -21,7 +21,6 @@
 package jalview.datamodel;
 
 import java.util.List;
-import java.util.Vector;
 
 import fr.orsay.lri.varna.models.rna.RNA;