git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c920b3c 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

1  2 
src/jalview/datamodel/SequenceI.java patch | diff1 | diff2 | blob | history

diff --cc src/jalview/datamodel/SequenceI.java
index 5c77940,876db03..2e68371
--- 1/src/jalview/datamodel/SequenceI.java
--- 2/src/jalview/datamodel/SequenceI.java
+++ b/src/jalview/datamodel/SequenceI.java
@@@ -20,7 -20,8 +20,7 @@@
   */
  package jalview.datamodel;
  
- import java.util.Vector;
+ import java.util.List;
 -import java.util.Vector;
  
  import fr.orsay.lri.varna.models.rna.RNA;