X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FAlignViewport.java;h=91cc51e1733e719cba73b8249a8827d7a531d28b;hb=6407c5a12a5768eace1b7fd25cea265601b494c3;hp=921189bf1727799ea9372995759ee8ac41652acb;hpb=49a7daf06cb98b45ce2d33ea25b15172c4204dda;p=jalview.git

diff --git a/src/jalview/gui/AlignViewport.java b/src/jalview/gui/AlignViewport.java
index 921189b..91cc51e 100644
--- a/src/jalview/gui/AlignViewport.java
+++ b/src/jalview/gui/AlignViewport.java
@@ -1279,7 +1279,7 @@ public class AlignViewport extends AlignmentViewport implements
     }
   }
 
-<<<<<<< HEAD
+
   public Hashtable getFeaturesDisplayed()
   {
     return featuresDisplayed;
@@ -1288,7 +1288,7 @@ public class AlignViewport extends AlignmentViewport implements
   public void setFeaturesDisplayed(Hashtable featuresDisplayed)
   {
     this.featuresDisplayed = featuresDisplayed;
-=======
+  }
   protected SequenceAnnotationOrder getSortAnnotationsBy()
   {
     return sortAnnotationsBy;
@@ -1307,6 +1307,5 @@ public class AlignViewport extends AlignmentViewport implements
   protected void setShowAutocalculatedAbove(boolean showAutocalculatedAbove)
   {
     this.showAutocalculatedAbove = showAutocalculatedAbove;
->>>>>>> branch 'features/JAL-1541_BioJsMSAViewer-export-option' of https://source.jalview.org/git/jalview.git
   }
 }