From 6407c5a12a5768eace1b7fd25cea265601b494c3 Mon Sep 17 00:00:00 2001 From: Charles Ofoegbu Date: Fri, 14 Nov 2014 15:54:43 +0000 Subject: [PATCH] house keeping --- src/jalview/gui/AlignViewport.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) 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 } } -- 1.7.10.2