git://source.jalview.org / jalview.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Merge branch 'Jalview-JS/develop' into develop
[jalview.git] / src / jalview / controller / AlignViewController.java
diff --git a/src/jalview/controller/AlignViewController.java b/src/jalview/controller/AlignViewController.java
index 0bb2d03..ee46a89 100644 (file)
--- a/src/jalview/controller/AlignViewController.java
+++ b/src/jalview/controller/AlignViewController.java
@@ -374,7 +374,7 @@ public class AlignViewController implements AlignViewControllerI
   }
 
   @Override
-  public boolean parseFeaturesFile(String file, DataSourceType protocol,
+  public boolean parseFeaturesFile(Object file, DataSourceType protocol,
           boolean relaxedIdMatching)
   {
     boolean featuresAdded = false;